Updated map generation