userProperties -> UserEntity refactoring