Improved build environment