Refactored user fields