add delayed indexing