Added controller and model