Extracted indexer to top level