Improved build system