Move metric out of models