Add "old streams" support, 0.5.1