Moving provisioning stuff to master