Some improvements in streaming data example