Added type and subtype coding to parsing methods.