Added client support for listening