Added messaging metric
Handled NAN condition for Encapsulation metric