Starting the refactoring of types