Map refactoring.