Merge "Fixed the streams and the imports issues"