Add updated support for buffalo routers (#1874)