YH-183: Updated vocabularies