Improve save map