Rework random map creation