Dataobject scene refactor