Added better structured hosts API