First commit of Indexer