Support multiple machines with same name