Upgrades for 2.4+