Added routers support