Enhanced build.xml