Add vSphere support

Can't the body of this loop be included in the previous one?