Added extra mutant support