Changing code to remove StructureUpgrade class