Content stream handler refactored.