Revert "DML part 2"

This reverts commit 2e3c1b1ac8e40ec467a1b96cf3e2eab5e8e0059c.
Revert "Revert "DML part 2""

This reverts commit 5dccca45048e5d56fc5d2650efe088838f7a0050.