removed DataFormatWrap and added StreamWrapper instead.