Feature/refactor provisioning