Provisioning and script related changes done