Improved the build system