Optimized code
Update build tool