add indices to speed up metric calcs