Added different metrics to validation