Refactoring Metrics Properties to add user defined metrics