Model refactor to utilize a Mapper pattern instead of controller logic