More restructure of dataobjects