Added line indexes support to data driven