Improve ant build
Improve ANT build
Improve ANT build