Updating streaming code to use new constructors