Improve build.xml