Add auto-generated indexer