Better matrix build