Changed single-valued datapoints back to deferred execution