rename StreamWrapper classes
let message accept string for data source