Types added
Type2 changed to subtype
Type2 changed to subtype