Add support for NULL data sets