Updated for PCF OpsMetrics 1.2