Add constructor for Metric

Also use constructor and String function where appropriate.