Added abbility to store currentstream in session