Data Stream mprovements