Added missing classes to upgrade.