Identity models refactored