added more subtypes