Added save support for maps