Refactoring MetricsProperies to add user defined metrics