diff --git a/src/main/java/com/kamco/cd/training/train/service/ModelTrainMetricsJobService.java b/src/main/java/com/kamco/cd/training/train/service/ModelTrainMetricsJobService.java
index ad65e14..6566cf7 100644
--- a/src/main/java/com/kamco/cd/training/train/service/ModelTrainMetricsJobService.java
+++ b/src/main/java/com/kamco/cd/training/train/service/ModelTrainMetricsJobService.java
@@ -85,34 +85,20 @@ public class ModelTrainMetricsJobService {
 
           int epoch = Integer.parseInt(record.get("Epoch"));
 
-          float aAcc = parseFloatSafe(record.get("aAcc"));
-          float mFscore = parseFloatSafe(record.get("mFscore"));
-          float mPrecision = parseFloatSafe(record.get("mPrecision"));
-          float mRecall = parseFloatSafe(record.get("mRecall"));
-          float mIoU = parseFloatSafe(record.get("mIoU"));
-          float mAcc = parseFloatSafe(record.get("mAcc"));
+          Float aAcc = parseFloatSafe(record.get("aAcc"));
+          Float mFscore = parseFloatSafe(record.get("mFscore"));
+          Float mPrecision = parseFloatSafe(record.get("mPrecision"));
+          Float mRecall = parseFloatSafe(record.get("mRecall"));
+          Float mIoU = parseFloatSafe(record.get("mIoU"));
+          Float mAcc = parseFloatSafe(record.get("mAcc"));
 
-          float changed_fscore = parseFloatSafe(record.get("changed_fscore"));
-          float changed_precision = parseFloatSafe(record.get("changed_precision"));
-          float changed_recall = parseFloatSafe(record.get("changed_recall"));
+          Float changed_fscore = parseFloatSafe(record.get("changed_fscore"));
+          Float changed_precision = parseFloatSafe(record.get("changed_precision"));
+          Float changed_recall = parseFloatSafe(record.get("changed_recall"));
 
-          float unchanged_fscore = parseFloatSafe(record.get("unchanged_fscore"));
-          float unchanged_precision = parseFloatSafe(record.get("unchanged_precision"));
-          float unchanged_recall = parseFloatSafe(record.get("unchanged_recall"));
-          //          int epoch = Integer.parseInt(record.get("Epoch"));
-          //          float aAcc = Float.parseFloat(record.get("aAcc"));
-          //          float mFscore = Float.parseFloat(record.get("mFscore"));
-          //          float mPrecision = Float.parseFloat(record.get("mPrecision"));
-          //          float mRecall = Float.parseFloat(record.get("mRecall"));
-          //          float mIoU = Float.parseFloat(record.get("mIoU"));
-          //          float mAcc = Float.parseFloat(record.get("mAcc"));
-          //          float changed_fscore = Float.parseFloat(record.get("changed_fscore"));
-          //          float changed_precision = Float.parseFloat(record.get("changed_precision"));
-          //          float changed_recall = Float.parseFloat(record.get("changed_recall"));
-          //          float unchanged_fscore = Float.parseFloat(record.get("unchanged_fscore"));
-          //          float unchanged_precision =
-          // Float.parseFloat(record.get("unchanged_precision"));
-          //          float unchanged_recall = Float.parseFloat(record.get("unchanged_recall"));
+          Float unchanged_fscore = parseFloatSafe(record.get("unchanged_fscore"));
+          Float unchanged_precision = parseFloatSafe(record.get("unchanged_precision"));
+          Float unchanged_recall = parseFloatSafe(record.get("unchanged_recall"));
 
           batchArgs.add(
               new Object[] {