More changes to the model for a Metric Type