Models, controllers and templates modified