Refactoring to use event and ADC classes