Further refactoring of dictionary loaders