Add multi-host support

As discussed.