Map File Format Change

Some change on the map template file
Merge branch 'zz_local'