Proxy and server code improved to allow any object.