Updated DAQ with better configuration options