Added shapes for streams, added scheme