Adding back top-level compilers to matrix