Optimization for build