Better flow for the provisioning