Vincent Sanders add index support