Changes for IndexScan to include RID