refactoring Type to AnnoType