Finishes up changes for metrics.models for now