Extended vocabulary

Merge extended vocabulary updates into main editor's draft