Switch to streaming-commons