Added routerFactory