Improved the build matrix