Adding compatibility with the server