CompatibilityUtils refactor