Added appropriate subtype