Adding support for non-localhost connections