Added Stream to some constructors