Improved base provisioning