Improve provisioning