Add support for matrix builds