Continue working on the refactor, add dynamic mapping of user type to controller