Improved build.xml