Modified the router call as result of a refactor