Upgrade rework to 1.0.0