updated indexer for CCV