Added support for null data values.