Working on map editor