adding support for vocabularies