Added support for iterable datapoints