More changes to support index skipping
Test index skipping