Moved ClientSender to own class