Add Remote DataStreamer
Fix if else bug