Refactoring identity-core with generic classes
Refactoring identity-core with generic classes