changes for Type's class declaration