Added map generation