A little refactor on map xml