Refactoring for new UserModel Bundle