C2 MAT: Internal modifications