Made link tracking less Taguchi-specific