Added some support for dataobjects