Add some more convenience methods to Metrics and refactorings