Updated ClientSender and Client