Merge "Add methods for managing subtypes"