Improved builder batch file