Added less features to Metrics