Adapt comment sharing
Adapt for stream changes