Attempted to add remote server support