Better map generation