Added subtypes