Extend vocabulary and update some entries