Improve the build system