First draft of ADC support