Types refactoring