Added non-localhost support