Added support for taxonomy vocabularies and terms.