Add multi-field index support