Changed structure: ship only the client