Form refactoring and initial configuration dump