Work with new map layout