Added support for multiple machines in one class.