More updates to UserProfile