AVALANCHE: Enhanced: Replace namespace with class.