diff --git a/app/src/main/java/de/edotzlaff/schockwelle/Devices.java b/app/src/main/java/de/edotzlaff/schockwelle/Devices.java
index c53d933..2e74d43 100644
--- a/app/src/main/java/de/edotzlaff/schockwelle/Devices.java
+++ b/app/src/main/java/de/edotzlaff/schockwelle/Devices.java
@@ -3,84 +3,102 @@ package de.edotzlaff.schockwelle;
 import java.time.LocalDateTime;
 
 public class Devices {
-    private String ip;
-    private boolean vibration;
-    private long timestamp;
-    private double breitengrad;
-    private double laengengrad;
-    private int amplitude;
-    private String localdatetime;
-    private boolean idvergeben;
-    private String androidid;
+    private String a_androidid;
+    private String b_localdatetime;
+    private String c_ip;
+    private double d_breitengrad;
+    private double e_laengengrad;
+    private boolean f_nativegps;
+    private boolean g_vibration;
+    private long h_timestamp;
+    private int i_amplitude;
+
 
     public Devices() {
 
     }
 
-    public Devices(String ip, boolean vibration, long timestamp, double breitengrad, double laengengrad, int amplitude, String localdatetime, String androidid) {
-        this.ip = ip;
-        this.vibration = vibration;
-        this.timestamp = timestamp;
-        this.breitengrad = breitengrad;
-        this.laengengrad = laengengrad;
-        this.amplitude = amplitude;
-        this.localdatetime = localdatetime;
-        this.androidid = androidid;
+    public Devices(String a_androidid, String b_localdatetime, String c_ip, double d_breitengrad, double e_laengengrad, boolean f_nativegps, boolean g_vibration, long h_timestamp, int i_amplitude) {
+        this.a_androidid = a_androidid;
+        this.b_localdatetime = b_localdatetime;
+        this.c_ip = c_ip;
+        this.d_breitengrad = d_breitengrad;
+        this.e_laengengrad = e_laengengrad;
+        this.f_nativegps = f_nativegps;
+        this.g_vibration = g_vibration;
+        this.h_timestamp = h_timestamp;
+        this.i_amplitude = i_amplitude;
     }
 
-    public String getIp() {
-        return ip;
-    }
-    public void setIp(String ip) {
-        this.ip = ip;
+    public String getA_androidid() {
+        return a_androidid;
     }
 
-    public boolean isVibration() {
-        return vibration;
-    }
-    public void setVibration(boolean vibration) {
-        this.vibration = vibration;
+    public void setA_androidid(String a_androidid) {
+        this.a_androidid = a_androidid;
     }
 
-    public long getTimestamp() {
-        return timestamp;
-    }
-    public void setTimestamp(long timestamp) {
-        this.timestamp = timestamp;
+    public String getB_localdatetime() {
+        return b_localdatetime;
     }
 
-    public double getBreitengrad() {
-        return breitengrad;
-    }
-    public void setBreitengrad(double breitengrad) {
-        this.breitengrad = breitengrad;
+    public void setB_localdatetime(String b_localdatetime) {
+        this.b_localdatetime = b_localdatetime;
     }
 
-    public double getLaengengrad() {
-        return laengengrad;
-    }
-    public void setLaengengrad(double laengengrad) {
-        this.laengengrad = laengengrad;
+    public String getC_ip() {
+        return c_ip;
     }
 
-    public int getAmplitude() {
-        return amplitude;
-    }
-    public void setAmplitude(int amplitude) {
-        this.amplitude = amplitude;
+    public void setC_ip(String c_ip) {
+        this.c_ip = c_ip;
     }
 
-    public String getLocaldatetime() {
-        return localdatetime;
-    }
-    public void setLocaldatetime(String localdatetime) {
-        this.localdatetime = localdatetime;
+    public double getD_breitengrad() {
+        return d_breitengrad;
     }
 
-    public String getAndroidid() {
-        return androidid;
+    public void setD_breitengrad(double d_breitengrad) {
+        this.d_breitengrad = d_breitengrad;
     }
-    public void setAndroidid(String androidid) {
-        this.androidid = androidid;
+
+    public double getE_laengengrad() {
+        return e_laengengrad;
+    }
+
+    public void setE_laengengrad(double e_laengengrad) {
+        this.e_laengengrad = e_laengengrad;
+    }
+
+    public boolean isF_nativegps() {
+        return f_nativegps;
+    }
+
+    public void setF_nativegps(boolean f_nativegps) {
+        this.f_nativegps = f_nativegps;
+    }
+
+    public boolean isG_vibration() {
+        return g_vibration;
+    }
+
+    public void setG_vibration(boolean g_vibration) {
+        this.g_vibration = g_vibration;
+    }
+
+    public long getH_timestamp() {
+        return h_timestamp;
+    }
+
+    public void setH_timestamp(long h_timestamp) {
+        this.h_timestamp = h_timestamp;
+    }
+
+    public int getI_amplitude() {
+        return i_amplitude;
+    }
+
+    public void setI_amplitude(int i_amplitude) {
+        this.i_amplitude = i_amplitude;
     }
 }