Added support for data values in attributes.