Refactored UserManager & UserModel