Updated classifier and dictionaries