Changes for simpler provisioning