Strengthen diff support