Add subtype as a separate property