Map refactoring