Adding multi-machine support for zen and main