Small optimization to data loading - index at the end