Add Metric and Measurement models