Added machine_name aware teams