Upgraded compatibility