Vocabulary file format changed. Refactoring