Refactored CreateStreamListener method