Hot patch to add Metrics