ATC refactoring