Extending support for Stream in input model