Further updates to stream definition and ordering.