Use DiffOp rather then IDiffOp

Change-Id: Ic115d2e9e61446ab78c739ae7e32b1b9c6014e42