-Add distance tracking for metrics