Handle variants properly, make new Avenger work