Added map saving