Improve build matrix