Added support for DataObjects