BUILD: Improving build system