Changes with the router/controller implementation