Better build matrix