Reorganizing map creation