Add PublicDiffCriteria and related config options