various provisioning change and fix #16