Initial support for multiple machines