Introduce check for columnStore