Improving build system