Some deprecation warnings fixed
Added stream reconstruction and tests