Optimize build procedure