Some improvements in the provisioning