Changes for Cachematrix