Improved build configuration