Updated version of Server Client files to work with URLs