Changed Types to inherit from BaseType