Refactored code, Add ant task code