Refactor for Model Controller