Future-proofing streaming