Refactored user and user profile.