Refactor for diff support