DRS indexing improvements