Work on server connectivity