Fix server/machine mapping
Update with the modified security group interface