Improved build matrix