Improved support for multi-host config