added support for sub data values