Improved Data stream classes