Refactoring GenerationDeMap