Adding new features for indexer