Added more to dataobject classes