Refactored user entity