REST server and client improvements