Added additional probe/metric types and fixed distibution count metric