Parser now searches for both 'type' and 'subtype'