Added decorator and refactored UsersController