Implemented new map generation