Removed the need for a DictionaryFactory.