Add automatic stream choice/detection