Added Data Queue and watcher code