Vocabulary and VocabularyLoader updated