Map refactored.