adding indexing support