Merge "API to set additional subtypes"