Update for provisioning
Merge branch 'add_provisioning'