diff --git a/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java b/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java
index a3ea781e..769e5652 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/datatypes/ScaleMeasurement.java
@@ -46,34 +46,34 @@ public class ScaleMeasurement implements Cloneable {
     private int userId;
     @ColumnInfo(name = "enabled")
     private boolean enabled;
-    @CsvColumn (format = "dd.MM.yyyy HH:mm")
+    @CsvColumn(format = "dd.MM.yyyy HH:mm", mustNotBeBlank = true)
     @ColumnInfo(name = "datetime")
     private Date dateTime;
-    @CsvColumn
+    @CsvColumn(mustNotBeBlank = true)
     @ColumnInfo(name = "weight")
     private float weight;
-    @CsvColumn
+    @CsvColumn(mustBeSupplied = false)
     @ColumnInfo(name = "fat")
     private float fat;
-    @CsvColumn
+    @CsvColumn(mustBeSupplied = false)
     @ColumnInfo(name = "water")
     private float water;
-    @CsvColumn
+    @CsvColumn(mustBeSupplied = false)
     @ColumnInfo(name = "muscle")
     private float muscle;
-    @CsvColumn
+    @CsvColumn(mustBeSupplied = false)
     @ColumnInfo(name = "lbw")
     private float lbm;
-    @CsvColumn
+    @CsvColumn(mustBeSupplied = false)
     @ColumnInfo(name = "waist")
     private float waist;
-    @CsvColumn
+    @CsvColumn(mustBeSupplied = false)
     @ColumnInfo(name = "hip")
     private float hip;
-    @CsvColumn
+    @CsvColumn(mustBeSupplied = false)
     @ColumnInfo(name = "bone")
     private float bone;
-    @CsvColumn
+    @CsvColumn(mustBeSupplied = false)
     @ColumnInfo(name = "comment")
     private String comment;
 
diff --git a/android_app/app/src/main/java/com/health/openscale/core/utils/CsvHelper.java b/android_app/app/src/main/java/com/health/openscale/core/utils/CsvHelper.java
index 2d630e4d..981aa94b 100644
--- a/android_app/app/src/main/java/com/health/openscale/core/utils/CsvHelper.java
+++ b/android_app/app/src/main/java/com/health/openscale/core/utils/CsvHelper.java
@@ -40,36 +40,29 @@ public class CsvHelper {
 
         final String[] fields = sampleLine.split(",", -1);
 
-        // Return an array with header fields so that all the headers that actually are
-        // in the file for a given version comes first, and then the rest comes at the end.
+        // Return an array with header fields that match the guessed version.
         if (fields.length == 10) {
             // From version 1.6 up to 1.7
-            return new String[]{
-                    "dateTime", "weight", "fat", "water", "muscle", "lbm", "bone", "waist", "hip", "comment"};
+            return new String[]{"dateTime", "weight", "fat", "water", "muscle", "lbm",
+                    "bone", "waist", "hip", "comment"};
         }
         else if (fields.length == 9) {
-            // From version 1.5.5 (lbm unused)
-            return new String[]{
-                    "dateTime", "weight", "fat", "water", "muscle", "bone", "waist", "hip", "comment",
-                    "lbm"};
+            // From version 1.5.5
+            return new String[]{"dateTime", "weight", "fat", "water", "muscle", "bone",
+                    "waist", "hip", "comment"};
         }
         else if (fields.length == 8) {
-            // From version 1.3 (lbm and bone unused)
-            return new String[]{
-                    "dateTime", "weight", "fat", "water", "muscle", "waist", "hip", "comment",
-                    "lbm", "bone"};
+            // From version 1.3
+            return new String[]{"dateTime", "weight", "fat", "water", "muscle", "waist",
+                    "hip", "comment"};
         }
         else if (fields.length == 6) {
-            // From version 1.2 (lbm, bone, waist and hip unused)
-            return new String[]{
-                    "dateTime", "weight", "fat", "water", "muscle", "comment",
-                    "lbm", "bone", "waist", "hip"};
+            // From version 1.2
+            return new String[]{"dateTime", "weight", "fat", "water", "muscle", "comment"};
         }
         else if (fields.length == 5) {
-            // From version 1.0 (lbm, bone, waist, hip and muscle unused)
-            return new String[]{
-                    "dateTime", "weight", "fat", "water", "comment",
-                    "lbm", "bone", "waist", "hip", "muscle"};
+            // From version 1.0
+            return new String[]{"dateTime", "weight", "fat", "water", "comment"};
         }
 
         // Unknown input data format