More work on build.xml