Added definitions for indexer