Added subtype parser.