Allow datapoints to be referenced by dp id or by ds id + dp id