Fixed map saving with new changes