Going back to Data{Input,Output}Stream usage.

Signed-off-by: Paulo Pires <pjpires@ubiwhere.com>

--amend

Signed-off-by: Paulo Pires <pjpires@ubiwhere.com>

--amend

Signed-off-by: Paulo Pires <pjpires@ubiwhere.com>

--amend

Signed-off-by: Paulo Pires <pjpires@ubiwhere.com>