Metrics reworked into a model