Save client info on upgrade
Validation
Refactoring