Added streaming capabilities