Add server and client