Added service support to the client and server.