Adding first version of indexer