move to DeltaUtils all support classes