Improve the map, and add some map zone