Refactored provisioning