Changed how data is fetched by the ClientSender