Feature/package data stream not filename