#21 make Type and Subtype data types