Changes to document pivot and the vocabularies