Datastreams not nodes

Includes #304