Refactoring of service/controller and model