Updated mappings, plugins and dictionary.