improved build matrix