2 files changed, 16 insertions, 11 deletions
diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/Beat.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Beat.java
index 2de48e7..02ed5d2 100644
--- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/Beat.java
+++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Beat.java
@@ -1,5 +1,7 @@
 package de.uvok.tuxguitar;
 
+import java.util.Optional;
+
 public class Beat {
     public int type;
     public boolean rest;
@@ -7,15 +9,13 @@ public class Beat {
     public int[] duration;
     public boolean dotted;
     
-    public Tempo tempo;
+    public Optional<Tempo> tempo;
 
     public boolean beamStart;
     public boolean beamStop;
 
     // maybe make enum
-    public String velocity;
-
-    public int upStroke;
-
-    public Text text;
+    public Optional<String> velocity;
+    public Optional<Integer> upStroke;
+    public Optional<Text> text;
 }
diff --git a/songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java
index 35f3bb2..a6dc3ee 100644
--- a/songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java
+++ b/songsterr-reader/src/main/java/de/uvok/tuxguitar/Measure.java
@@ -1,12 +1,17 @@
 package de.uvok.tuxguitar;
 
+import java.util.Optional;
+
 public class Measure {
     public int index;
-    public int[] signature;
-    public boolean rest;
-    public Voice voices[];
+    public Voice[] voices;
+    
+    public Boolean rest;
+    public Boolean repeatStart;
 
-    public boolean repeatStart;
-    public int repeat;
+    // *maybe* the default is 1?
+    public Optional<java.lang.Integer> repeat;
+
+    public int[] signature;
     public int[] alternateEnding;
 }