Map and build.xml updated