added new compoenets and new step for main wizard.