Adding indexing support.