Add multiple host support