Refactored ADC and Activator