Switched to a different implementation of DictionaryUtil