Added diagonal context matrices.