Support non-threaded fetching as well
Support non-threaded fetching as well

rcos/Observatory,rcos/Observatory,rcos/Observatory,rcos/Observatory,natestedman/Observatory,natestedman/Observatory,natestedman/Observatory,rcos/Observatory,rcos/Observatory