Refactor provision wizard