Refactoring new action controller to new entity