Added TCP channels to both Client and Listener

Added TCP channel to both Client and Listener classes.