Added streamwrapper