Improving build process