Added disabling of map saving