Refactoring map.