Updated map generator