Added remote host support