Made some changes for the map creation