Refactored UserManagement to remove need to User conversions