Fixing DML to leverage client