TypeRegistry added
Initializer added
Refactoring