Refactoring IUpgradeable, added Upgrade for 06.03.07