Improvements to User object