Refactored datastreams lists