add data-from-index support