AVALANCHE: More refactoring