Removed dependence on hostname and port number