Adding ability to set host field