A very massive dictionary refactoring