Updates to client and server for HTTP