Further map modifications