Improving Build Process