[Change] Sender Listener to Socket based