Added more vnet and affinity group stuff