Build Matrix improvements