added Map and map generator