Refactored Userd fields