Added ability to select stream