Add schema subtypes and builder