Work on the Map generation