overall changes on the vocabulary and the mapping file