refactor Vocabulary and adding the result to the mapping module.