Reworked the way battle reference were handle inside the interception system.