Updated the list of words and added support for them in the new format