Add multi-column index support