Changes to the controllers and routing