Add UserId object
Clean up User entity