CHANS refactoring