Updated to new syntax and included support for VMware provider