Added support for data values