Improving creation wizard.