Added additional metrics to models