Modifications for multiple host setup.