Modified client, server, ClientInfo