Adds Client and server, improves requestType