Added map saving support