added DataStream class and test