diff --git a/app/build.gradle b/app/build.gradle
index 98963f4..2d693d5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ apply from: "$rootProject.projectDir/shared-build.gradle"
 
 android {
     defaultConfig {
-        versionCode 97
+        versionCode 107
         wearAppUnbundled true
     }
     buildFeatures {
@@ -13,19 +13,19 @@ android {
 
 dependencies {
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.navigation:navigation-fragment:2.7.3'
-    implementation 'androidx.navigation:navigation-ui:2.7.3'
+    implementation 'androidx.navigation:navigation-fragment:2.7.5'
+    implementation 'androidx.navigation:navigation-ui:2.7.5'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    implementation 'org.reactivestreams:reactive-streams:1.0.3'
-    implementation 'io.reactivex.rxjava2:rxjava:2.2.9'
+    implementation 'org.reactivestreams:reactive-streams:1.0.4'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.21'
     implementation 'android.arch.lifecycle:livedata:1.1.1'
 
     implementation "androidx.core:core:1.12.0"
     implementation 'androidx.core:core-google-shortcuts:1.1.0'
 
-    def room_version = "2.5.2"
+    def room_version = "2.6.0"
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
 
@@ -34,8 +34,8 @@ dependencies {
     implementation 'org.bouncycastle:bcprov-jdk15on:1.70'
     implementation 'org.bouncycastle:bcpkix-jdk15on:1.70'
 
-    implementation files('libs/android-ping.aar')
     implementation project(path: ':shared-models')
+    implementation project(path: ':ping')
 
     // Fix Duplicate class
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
diff --git a/app/libs/android-ping.aar b/app/libs/android-ping.aar
deleted file mode 100644
index bcbdd9f..0000000
Binary files a/app/libs/android-ping.aar and /dev/null differ
diff --git a/app/src/main/java/de/florianisme/wakeonlan/persistence/models/Device.java b/app/src/main/java/de/florianisme/wakeonlan/persistence/models/Device.java
index 26d0c84..4308747 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/persistence/models/Device.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/persistence/models/Device.java
@@ -1,6 +1,11 @@
 package de.florianisme.wakeonlan.persistence.models;
 
-public class Device {
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+
+public class Device implements Parcelable {
 
     public int id;
 
@@ -48,4 +53,53 @@ public Device(int id, String name, String macAddress, String broadcastAddress, i
 
     public Device() {
     }
+
+    public static final Parcelable.Creator<Device> CREATOR
+            = new Parcelable.Creator<>() {
+        public Device createFromParcel(Parcel in) {
+            return new Device(in);
+        }
+
+        public Device[] newArray(int size) {
+            return new Device[size];
+        }
+    };
+
+    private Device(Parcel in) {
+        this.id = in.readInt();
+        this.name = in.readString();
+        this.macAddress = in.readString();
+        this.broadcastAddress = in.readString();
+        this.port = in.readInt();
+        this.statusIp = in.readString();
+        this.secureOnPassword = in.readString();
+        this.remoteShutdownEnabled = in.readInt() >= 1;
+        this.sshAddress = in.readString();
+        this.sshPort = in.readInt();
+        this.sshUsername = in.readString();
+        this.sshPassword = in.readString();
+        this.sshCommand = in.readString();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(@NonNull Parcel dest, int flags) {
+        dest.writeInt(id);
+        dest.writeString(name);
+        dest.writeString(macAddress);
+        dest.writeString(broadcastAddress);
+        dest.writeInt(port);
+        dest.writeString(statusIp);
+        dest.writeString(secureOnPassword);
+        dest.writeInt(remoteShutdownEnabled ? 1 : 0);
+        dest.writeString(sshAddress);
+        dest.writeInt(sshPort == null ? -1 : sshPort);
+        dest.writeString(sshUsername);
+        dest.writeString(sshPassword);
+        dest.writeString(sshCommand);
+    }
 }
diff --git a/app/src/main/java/de/florianisme/wakeonlan/quickaccess/QuickAccessProviderService.java b/app/src/main/java/de/florianisme/wakeonlan/quickaccess/QuickAccessProviderService.java
index 85eef85..5acd22a 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/quickaccess/QuickAccessProviderService.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/quickaccess/QuickAccessProviderService.java
@@ -46,7 +46,7 @@ public Flow.Publisher<Control> createPublisherFor(@NonNull List<String> controlI
 
     @Override
     public void onDestroy() {
-        StatefulControlService.unscheduleStatusTester();
+        StatefulControlService.stopAllStatusTesters();
         super.onDestroy();
     }
 
diff --git a/app/src/main/java/de/florianisme/wakeonlan/quickaccess/StatefulControlService.java b/app/src/main/java/de/florianisme/wakeonlan/quickaccess/StatefulControlService.java
index 7f0476a..04a5afe 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/quickaccess/StatefulControlService.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/quickaccess/StatefulControlService.java
@@ -12,28 +12,22 @@
 import androidx.annotation.RequiresApi;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 import de.florianisme.wakeonlan.R;
 import de.florianisme.wakeonlan.persistence.models.Device;
 import de.florianisme.wakeonlan.persistence.models.DeviceStatus;
 import de.florianisme.wakeonlan.persistence.repository.DeviceRepository;
-import de.florianisme.wakeonlan.ui.list.status.DeviceStatusTester;
-import de.florianisme.wakeonlan.ui.list.status.PingDeviceStatusTester;
+import de.florianisme.wakeonlan.ui.list.status.pool.PingStatusTesterPool;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTestType;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTesterPool;
 import io.reactivex.processors.ReplayProcessor;
 
 @RequiresApi(api = Build.VERSION_CODES.R)
 public class StatefulControlService {
 
-    private static final Map<Integer, DeviceStatusTester> statusTesterMap = new HashMap<>();
-
-    static void unscheduleStatusTester() {
-        statusTesterMap.forEach((id, tester) -> tester.stopDeviceStatusPings());
-        statusTesterMap.clear();
-    }
+    private static final StatusTesterPool STATUS_TESTER_POOL = PingStatusTesterPool.getInstance();
 
     static void createAndUpdateStatefulControls(List<String> deviceIds, ReplayProcessor<Control> processor, Context context) {
         DeviceRepository deviceRepository = DeviceRepository.getInstance(context);
@@ -42,12 +36,10 @@ static void createAndUpdateStatefulControls(List<String> deviceIds, ReplayProces
                 .collect(Collectors.toList());
 
         for (Device device : filteredDevices) {
-            DeviceStatusTester deviceStatusTester = statusTesterMap.getOrDefault(device.id, new PingDeviceStatusTester());
-            statusTesterMap.putIfAbsent(device.id, deviceStatusTester);
-            deviceStatusTester.scheduleDeviceStatusPings(device, deviceStatus -> {
+            STATUS_TESTER_POOL.scheduleStatusTest(device, deviceStatus -> {
                 Control control = mapDeviceToStatefulControl(device, deviceStatus == DeviceStatus.ONLINE, context);
                 processor.onNext(control);
-            });
+            }, StatusTestType.QUICK_ACCESS);
         }
     }
 
@@ -67,4 +59,7 @@ private static Control mapDeviceToStatefulControl(Device device, boolean toggleO
                 .build();
     }
 
+    public static void stopAllStatusTesters() {
+        STATUS_TESTER_POOL.stopAllStatusTesters(StatusTestType.QUICK_ACCESS);
+    }
 }
diff --git a/app/src/main/java/de/florianisme/wakeonlan/quicksettings/DeviceTileService.java b/app/src/main/java/de/florianisme/wakeonlan/quicksettings/DeviceTileService.java
index a05230b..2e6c662 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/quicksettings/DeviceTileService.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/quicksettings/DeviceTileService.java
@@ -3,7 +3,6 @@
 import android.os.Build;
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
-import android.util.Log;
 import android.widget.Toast;
 
 import java.util.List;
@@ -13,18 +12,22 @@
 import de.florianisme.wakeonlan.persistence.models.Device;
 import de.florianisme.wakeonlan.persistence.models.DeviceStatus;
 import de.florianisme.wakeonlan.persistence.repository.DeviceRepository;
+import de.florianisme.wakeonlan.shutdown.ShutdownExecutor;
 import de.florianisme.wakeonlan.ui.list.status.DeviceStatusListener;
-import de.florianisme.wakeonlan.ui.list.status.DeviceStatusTester;
-import de.florianisme.wakeonlan.ui.list.status.PingDeviceStatusTester;
+import de.florianisme.wakeonlan.ui.list.status.pool.PingStatusTesterPool;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTestType;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTesterPool;
 import de.florianisme.wakeonlan.wol.WolSender;
 
 public abstract class DeviceTileService extends TileService implements DeviceStatusListener {
 
-    private final DeviceStatusTester deviceStatusTester = new PingDeviceStatusTester();
+    private final StatusTesterPool statusTesterPool = PingStatusTesterPool.getInstance();
 
     private DeviceRepository deviceRepository;
     private Device device;
 
+    private DeviceStatus lastDeviceStatus = DeviceStatus.UNKNOWN;
+
 
     @Override
     public void onTileAdded() {
@@ -41,7 +44,7 @@ private void updateTileState() {
         if (optionalMachine.isPresent()) {
             Device device = optionalMachine.get();
             this.device = device;
-            deviceStatusTester.scheduleDeviceStatusPings(device, this);
+            statusTesterPool.scheduleStatusTest(device, this, StatusTestType.TILE);
 
             tile.setLabel(device.name);
             if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
@@ -67,15 +70,20 @@ public void onStatusAvailable(DeviceStatus deviceStatus) {
         Tile tile = getQsTile();
         tile.setState(deviceStatus == DeviceStatus.ONLINE ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE);
         tile.updateTile();
+
+        lastDeviceStatus = deviceStatus;
     }
 
     @Override
     public void onClick() {
-        try {
+        if (lastDeviceStatus == DeviceStatus.ONLINE) {
+            if (device.remoteShutdownEnabled) {
+                ShutdownExecutor.shutdownDevice(device);
+                Toast.makeText(this, getString(R.string.remote_shutdown_send_command, device.name), Toast.LENGTH_LONG).show();
+            }
+        } else {
             WolSender.sendWolPacket(device);
             Toast.makeText(this, getString(R.string.wol_toast_sending_packet, device.name), Toast.LENGTH_LONG).show();
-        } catch (Exception e) {
-            Log.e(this.getClass().getName(), "Error while sending WOL Packet", e);
         }
     }
 
@@ -88,7 +96,7 @@ public void onStartListening() {
     @Override
     public void onStopListening() {
         super.onStopListening();
-        deviceStatusTester.stopDeviceStatusPings();
+        statusTesterPool.stopStatusTest(device, StatusTestType.TILE);
     }
 
     abstract int machineAtIndex();
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/MainActivity.java b/app/src/main/java/de/florianisme/wakeonlan/ui/MainActivity.java
index 4350a23..b880e59 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/MainActivity.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/MainActivity.java
@@ -1,6 +1,10 @@
 package de.florianisme.wakeonlan.ui;
 
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
+import android.view.View;
+import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.view.GravityCompat;
@@ -14,6 +18,7 @@
 
 import java.util.Set;
 
+import de.florianisme.wakeonlan.BuildConfig;
 import de.florianisme.wakeonlan.R;
 import de.florianisme.wakeonlan.databinding.ActivityMainBinding;
 import de.florianisme.wakeonlan.persistence.repository.DeviceRepository;
@@ -34,6 +39,8 @@ protected void onCreate(Bundle savedInstanceState) {
         binding = ActivityMainBinding.inflate(getLayoutInflater());
         setContentView(binding.getRoot());
 
+        setVersionInformation();
+
         setSupportActionBar(binding.toolbar);
 
         initializeNavController();
@@ -41,6 +48,24 @@ protected void onCreate(Bundle savedInstanceState) {
         initializeShortcuts();
     }
 
+    private void setVersionInformation() {
+        View headerView = binding.navigationView.getHeaderView(0);
+
+        TextView versionView = headerView.findViewById(R.id.navigation_header_version);
+        TextView headerTitleView = headerView.findViewById(R.id.navigation_header_title);
+
+        headerTitleView.setOnApplyWindowInsetsListener((v, insets) -> {
+            int calculatedTopPadding = Math.round(insets.getSystemWindowInsetTop() +
+                    getResources().getDimension(R.dimen.navigation_header_top_padding));
+
+            headerTitleView.setPadding(versionView.getPaddingStart(), calculatedTopPadding,
+                    versionView.getPaddingEnd(), 0);
+            return insets;
+        });
+
+        versionView.setText(getString(R.string.drawer_menu_header_version, BuildConfig.VERSION_NAME));
+    }
+
     private void initializeWearClient() {
         wearClient = new WearClient(this);
         DeviceRepository.getInstance(this)
@@ -53,6 +78,17 @@ private void initializeNavController() {
         appBarConfiguration = new AppBarConfiguration.Builder(getMenuIds()).setOpenableLayout(binding.drawerLayout).build();
         NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
         NavigationUI.setupWithNavController(binding.navigationView, navController);
+
+        setGithubShortcut();
+    }
+
+    private void setGithubShortcut() {
+        binding.navigationView.getMenu().findItem(R.id.githubShortcut).setOnMenuItemClickListener(item -> {
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/Florianisme/WakeOnLan"));
+            startActivity(browserIntent);
+
+            return false;
+        });
     }
 
     private void initializeShortcuts() {
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/backup/DataExporter.java b/app/src/main/java/de/florianisme/wakeonlan/ui/backup/DataExporter.java
index 388d5fc..16dd922 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/backup/DataExporter.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/backup/DataExporter.java
@@ -9,10 +9,11 @@
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.fragment.app.Fragment;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
 
 import java.io.OutputStream;
 import java.lang.ref.WeakReference;
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -49,7 +50,7 @@ public void onActivityResult(Uri uri) {
                     .stream().map(DeviceBackupModel::new)
                     .collect(Collectors.toList());
 
-            byte[] content = new ObjectMapper().writeValueAsBytes(devices);
+            byte[] content = new Gson().toJson(devices).getBytes(StandardCharsets.UTF_8);
             writeDevicesToFile(uri, content, context);
 
             Toast.makeText(context, context.getString(R.string.backup_message_export_success, devices.size()), Toast.LENGTH_SHORT).show();
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/backup/DataImporter.java b/app/src/main/java/de/florianisme/wakeonlan/ui/backup/DataImporter.java
index b9e3585..e383ef7 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/backup/DataImporter.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/backup/DataImporter.java
@@ -9,11 +9,13 @@
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.fragment.app.Fragment;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.io.ByteStreams;
+import com.google.gson.Gson;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.lang.ref.WeakReference;
 import java.util.Arrays;
 
@@ -46,7 +48,8 @@ public void onActivityResult(Uri uri) {
 
         try {
             byte[] bytes = readContentFromFile(uri, context);
-            Device[] devices = Arrays.stream(new ObjectMapper().readValue(bytes, DeviceBackupModel[].class))
+            InputStreamReader inputStreamReader = new InputStreamReader(new ByteArrayInputStream(bytes));
+            Device[] devices = Arrays.stream(new Gson().fromJson(inputStreamReader, DeviceBackupModel[].class))
                     .map(DeviceBackupModel::toModel)
                     .toArray(Device[]::new);
 
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/backup/model/DeviceBackupModel.java b/app/src/main/java/de/florianisme/wakeonlan/ui/backup/model/DeviceBackupModel.java
index ef29968..a74323f 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/backup/model/DeviceBackupModel.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/backup/model/DeviceBackupModel.java
@@ -1,12 +1,9 @@
 package de.florianisme.wakeonlan.ui.backup.model;
 
-import com.fasterxml.jackson.annotation.JsonAlias;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.gson.annotations.SerializedName;
 
 import de.florianisme.wakeonlan.persistence.models.Device;
 
-@JsonIgnoreProperties(ignoreUnknown = true)
 public class DeviceBackupModel {
 
     /*
@@ -15,50 +12,43 @@ public class DeviceBackupModel {
     to JSON with its obfuscated name ("a", "b", and so on).
      */
 
-    @JsonProperty("id")
-    @JsonAlias("a")
+    @SerializedName(value = "id", alternate = "a")
     public int id;
 
-    @JsonProperty("name")
-    @JsonAlias("b")
+    @SerializedName(value = "name", alternate = "b")
     public String name;
 
-    @JsonProperty("mac_address")
-    @JsonAlias("c")
+    @SerializedName(value = "mac_address", alternate = "c")
     public String macAddress;
 
-    @JsonProperty("broadcast_address")
-    @JsonAlias("d")
+    @SerializedName(value = "broadcast_address", alternate = "d")
     public String broadcastAddress;
 
-    @JsonProperty("port")
-    @JsonAlias("e")
+    @SerializedName(value = "port", alternate = "e")
     public int port;
 
-    @JsonProperty("status_ip")
-    @JsonAlias("f")
+    @SerializedName(value = "status_ip", alternate = "f")
     public String statusIp;
 
-    @JsonProperty("secure_on_password")
-    @JsonAlias("g")
+    @SerializedName(value = "secure_on_password", alternate = "g")
     public String secureOnPassword;
 
-    @JsonProperty("remote_shutdown_enabled")
+    @SerializedName(value = "remote_shutdown_enabled")
     public boolean remoteShutdownEnabled;
 
-    @JsonProperty("ssh_address")
+    @SerializedName(value = "ssh_address")
     public String sshAddress;
 
-    @JsonProperty("ssh_port")
+    @SerializedName(value = "ssh_port")
     public Integer sshPort;
 
-    @JsonProperty("ssh_username")
+    @SerializedName(value = "ssh_username")
     public String sshUsername;
 
-    @JsonProperty("ssh_password")
+    @SerializedName(value = "ssh_password")
     public String sshPassword;
 
-    @JsonProperty("ssh_command")
+    @SerializedName(value = "ssh_command")
     public String sshCommand;
 
     public DeviceBackupModel(Device device) {
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/DeviceListAdapter.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/DeviceListAdapter.java
index a80bccb..4d1554c 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/list/DeviceListAdapter.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/DeviceListAdapter.java
@@ -12,6 +12,7 @@
 
 import de.florianisme.wakeonlan.R;
 import de.florianisme.wakeonlan.persistence.models.Device;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTesterPool;
 import de.florianisme.wakeonlan.ui.list.viewholder.DeviceItemViewHolder;
 import de.florianisme.wakeonlan.ui.list.viewholder.EmptyViewHolder;
 import de.florianisme.wakeonlan.ui.list.viewholder.ListViewType;
@@ -20,10 +21,13 @@ public class DeviceListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
 
     private final AsyncListDiffer<Device> listDiffer = new AsyncListDiffer<>(this, new DeviceDiffCallback());
     private final DeviceClickedCallback deviceClickedCallback;
+    private final StatusTesterPool statusTesterPool;
 
-    public DeviceListAdapter(List<Device> initialDataset, DeviceClickedCallback deviceClickedCallback) {
+    public DeviceListAdapter(List<Device> initialDataset, DeviceClickedCallback deviceClickedCallback, StatusTesterPool statusTesterPool) {
         this.deviceClickedCallback = deviceClickedCallback;
-        updateDataset(initialDataset);
+        this.statusTesterPool = statusTesterPool;
+
+        listDiffer.submitList(initialDataset);
     }
 
     public void updateDataset(List<Device> updatedDevices) {
@@ -43,7 +47,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup,
         } else {
             view = LayoutInflater.from(viewGroup.getContext())
                     .inflate(R.layout.device_list_item, viewGroup, false);
-            viewHolder = new DeviceItemViewHolder(view, deviceClickedCallback);
+            viewHolder = new DeviceItemViewHolder(view, deviceClickedCallback, statusTesterPool);
         }
 
         return viewHolder;
@@ -58,13 +62,6 @@ public int getItemViewType(int position) {
         }
     }
 
-    @Override
-    public void onViewRecycled(@NonNull RecyclerView.ViewHolder holder) {
-        if (holder instanceof DeviceItemViewHolder) {
-            ((DeviceItemViewHolder) holder).cancelStatusUpdates();
-        }
-    }
-
     @Override
     public long getItemId(int position) {
         if (listDiffer.getCurrentList().isEmpty()) {
@@ -85,15 +82,11 @@ public int getItemCount() {
     public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, final int position) {
         if (getItemViewType(position) == ListViewType.DEVICE.ordinal()) {
             DeviceItemViewHolder deviceItemViewHolder = (DeviceItemViewHolder) viewHolder;
+
             deviceItemViewHolder.cancelStatusUpdates();
-            Device device = listDiffer.getCurrentList().get(position);
 
-            deviceItemViewHolder.setDeviceName(device.name);
-            deviceItemViewHolder.setDeviceMacAddress(device.macAddress);
-            deviceItemViewHolder.setOnClickHandler(device);
-            deviceItemViewHolder.setOnEditClickHandler(device);
-            deviceItemViewHolder.setShutdownVisibilityAndClickHandler(device);
-            deviceItemViewHolder.startDeviceStatusQuery(device);
+            Device device = listDiffer.getCurrentList().get(position);
+            deviceItemViewHolder.fromDevice(device);
         }
     }
 }
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/DeviceListFragment.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/DeviceListFragment.java
index 6cd9fd8..c5c4e68 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/list/DeviceListFragment.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/DeviceListFragment.java
@@ -20,13 +20,19 @@
 import de.florianisme.wakeonlan.persistence.repository.DeviceRepository;
 import de.florianisme.wakeonlan.ui.list.layoutmanager.GridLayoutManagerWrapper;
 import de.florianisme.wakeonlan.ui.list.layoutmanager.LinearLayoutManagerWrapper;
+import de.florianisme.wakeonlan.ui.list.status.pool.PingStatusTesterPool;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTestType;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTesterPool;
 
 
 public class DeviceListFragment extends Fragment {
 
+    private DeviceRepository deviceRepository;
     private FragmentListDevicesBinding binding;
     private DeviceListAdapter deviceListAdapter;
 
+    private static final StatusTesterPool STATUS_TESTER_POOL = PingStatusTesterPool.getInstance();
+
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -36,23 +42,36 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         return binding.getRoot();
     }
 
+    @Override
+    public void onPause() {
+        super.onPause();
+        PingStatusTesterPool.getInstance().pauseAllForType(StatusTestType.LIST);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        PingStatusTesterPool.getInstance().resumeAll();
+    }
+
     @Override
     public void onViewCreated(@NonNull View view, Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
 
+        deviceRepository = DeviceRepository.getInstance(getContext());
+
         instantiateRecyclerView();
         registerLiveDataObserver();
     }
 
     private void registerLiveDataObserver() {
-        DeviceRepository.getInstance(getContext())
-                .getAllAsObservable()
+        deviceRepository.getAllAsObservable()
                 .observe(getViewLifecycleOwner(), devices -> deviceListAdapter.updateDataset(devices));
     }
 
     private void instantiateRecyclerView() {
         List<Device> initialDataset = DeviceRepository.getInstance(getContext()).getAll();
-        deviceListAdapter = new DeviceListAdapter(initialDataset, buildDeviceClickedCallback());
+        deviceListAdapter = new DeviceListAdapter(initialDataset, buildDeviceClickedCallback(), STATUS_TESTER_POOL);
         deviceListAdapter.setHasStableIds(true);
         RecyclerView devicesRecyclerView = binding.machineList;
 
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/DeviceStatusTester.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/DeviceStatusTester.java
deleted file mode 100644
index 24afc55..0000000
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/DeviceStatusTester.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package de.florianisme.wakeonlan.ui.list.status;
-
-import de.florianisme.wakeonlan.persistence.models.Device;
-
-public interface DeviceStatusTester {
-
-    void scheduleDeviceStatusPings(Device device, DeviceStatusListener deviceStatusListener);
-
-    void stopDeviceStatusPings();
-}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/DeviceStatusTesterBuilder.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/DeviceStatusTesterBuilder.java
new file mode 100644
index 0000000..33447ae
--- /dev/null
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/DeviceStatusTesterBuilder.java
@@ -0,0 +1,9 @@
+package de.florianisme.wakeonlan.ui.list.status;
+
+import de.florianisme.wakeonlan.persistence.models.Device;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTestItem;
+
+public interface DeviceStatusTesterBuilder {
+
+    Runnable buildStatusTestCallable(Device device, StatusTestItem statusTestItem);
+}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingDeviceStatusTester.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingDeviceStatusTester.java
deleted file mode 100644
index b92ab03..0000000
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingDeviceStatusTester.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package de.florianisme.wakeonlan.ui.list.status;
-
-import android.util.Log;
-
-import com.spectrum.android.ping.Ping;
-
-import java.net.InetAddress;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import de.florianisme.wakeonlan.persistence.models.Device;
-import de.florianisme.wakeonlan.persistence.models.DeviceStatus;
-
-public class PingDeviceStatusTester implements DeviceStatusTester {
-
-    private ScheduledExecutorService pingExecutor;
-
-    @Override
-    public void scheduleDeviceStatusPings(Device device, DeviceStatusListener deviceStatusListener) {
-        stopDeviceStatusPings();
-
-        pingExecutor = Executors.newSingleThreadScheduledExecutor();
-        pingExecutor.scheduleWithFixedDelay(() -> {
-            if (device.statusIp == null || device.statusIp.isEmpty()) {
-                deviceStatusListener.onStatusAvailable(DeviceStatus.UNKNOWN);
-                return;
-            }
-
-            try {
-                final InetAddress dest = InetAddress.getByName(device.statusIp);
-                final Ping ping = new Ping(dest, new Ping.PingListener() {
-                    @Override
-                    public void onPing(final long timeMs, final int count) {
-                        if (timeMs == -1L) {
-                            Log.w(getClass().getSimpleName(), String.format("Ping timed out for IP %s", device.statusIp));
-                            deviceStatusListener.onStatusAvailable(DeviceStatus.OFFLINE);
-                            return;
-                        }
-                        deviceStatusListener.onStatusAvailable(DeviceStatus.ONLINE);
-                    }
-
-                    @Override
-                    public void onPingException(final Exception e, final int count) {
-                        Log.w(getClass().getSimpleName(), String.format("Error while pinging device with IP %s", device.statusIp), e);
-                        deviceStatusListener.onStatusAvailable(DeviceStatus.OFFLINE);
-                    }
-                });
-                ping.setCount(1);
-                ping.setTimeoutMs(1000);
-                ping.run();
-            } catch (Exception e) {
-                Log.w(getClass().getSimpleName(), String.format("Error while pinging device with IP %s", device.statusIp), e);
-                deviceStatusListener.onStatusAvailable(DeviceStatus.UNKNOWN);
-            }
-        }, 0, 4000, TimeUnit.MILLISECONDS);
-    }
-
-    @Override
-    public void stopDeviceStatusPings() {
-        if (pingExecutor != null && !pingExecutor.isShutdown()) {
-            pingExecutor.shutdown();
-        }
-    }
-}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingDeviceStatusTesterBuilder.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingDeviceStatusTesterBuilder.java
new file mode 100644
index 0000000..b2982df
--- /dev/null
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingDeviceStatusTesterBuilder.java
@@ -0,0 +1,12 @@
+package de.florianisme.wakeonlan.ui.list.status;
+
+import de.florianisme.wakeonlan.persistence.models.Device;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTestItem;
+
+public class PingDeviceStatusTesterBuilder implements DeviceStatusTesterBuilder {
+
+    public Runnable buildStatusTestCallable(Device device, StatusTestItem statusTestItem) {
+        return new PingRunnable(device, statusTestItem);
+    }
+
+}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingRunnable.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingRunnable.java
new file mode 100644
index 0000000..30c8fb5
--- /dev/null
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/PingRunnable.java
@@ -0,0 +1,68 @@
+package de.florianisme.wakeonlan.ui.list.status;
+
+import android.util.Log;
+
+import java.net.InetAddress;
+
+import de.florianisme.wakeonlan.persistence.models.Device;
+import de.florianisme.wakeonlan.persistence.models.DeviceStatus;
+import de.florianisme.wakeonlan.ping.Ping;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTestItem;
+
+public class PingRunnable implements Runnable {
+
+    private final Device device;
+    private final StatusTestItem statusTestItem;
+
+    private boolean skipRunningExecutionResults = false;
+
+    public PingRunnable(Device device, StatusTestItem statusTestItem) {
+        this.device = device;
+        this.statusTestItem = statusTestItem;
+    }
+
+    public void cancelStatusUpdates() {
+        skipRunningExecutionResults = true;
+    }
+
+    @Override
+    public void run() {
+        if (device.statusIp == null || device.statusIp.isEmpty()) {
+            notifyDeviceStautsListeners(DeviceStatus.UNKNOWN);
+            return;
+        }
+
+        try {
+            final InetAddress dest = InetAddress.getByName(device.statusIp);
+            final Ping ping = new Ping(dest, new Ping.PingListener() {
+                @Override
+                public void onPing(final long timeMs) {
+                    if (timeMs == -1L) {
+                        Log.w(getClass().getSimpleName(), String.format("Ping timed out for IP %s", device.statusIp));
+                        notifyDeviceStautsListeners(DeviceStatus.OFFLINE);
+                        return;
+                    }
+                    notifyDeviceStautsListeners(DeviceStatus.ONLINE);
+                }
+
+                @Override
+                public void onPingException(final Exception e) {
+                    Log.w(getClass().getSimpleName(), String.format("Error while pinging device with IP %s", device.statusIp), e);
+                    notifyDeviceStautsListeners(DeviceStatus.OFFLINE);
+                }
+            });
+            ping.setTimeoutMs(1000);
+            ping.run();
+        } catch (Exception e) {
+            Log.w(getClass().getSimpleName(), String.format("Error while pinging device with IP %s", device.statusIp), e);
+            notifyDeviceStautsListeners(DeviceStatus.UNKNOWN);
+        }
+    }
+
+    private void notifyDeviceStautsListeners(DeviceStatus offline) {
+        if (!skipRunningExecutionResults) {
+            statusTestItem.forAllListeners(deviceStatusListener -> deviceStatusListener.onStatusAvailable(offline));
+        }
+    }
+
+}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/PingStatusTesterPool.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/PingStatusTesterPool.java
new file mode 100644
index 0000000..8b56846
--- /dev/null
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/PingStatusTesterPool.java
@@ -0,0 +1,130 @@
+package de.florianisme.wakeonlan.ui.list.status.pool;
+
+import android.util.Log;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
+
+import de.florianisme.wakeonlan.persistence.models.Device;
+import de.florianisme.wakeonlan.ui.list.status.DeviceStatusListener;
+import de.florianisme.wakeonlan.ui.list.status.DeviceStatusTesterBuilder;
+import de.florianisme.wakeonlan.ui.list.status.PingDeviceStatusTesterBuilder;
+
+public class PingStatusTesterPool implements StatusTesterPool {
+
+    private static final ScheduledExecutorService EXECUTOR = Executors.newScheduledThreadPool(15);
+    private static final DeviceStatusTesterBuilder DEVICE_STATUS_TESTER = new PingDeviceStatusTesterBuilder();
+
+    private static final Object STATUS_LOCK = new Object();
+
+    private static Map<Integer, StatusTestItem> statusCheckMap = new HashMap<>(15);
+
+    private static StatusTesterPool INSTANCE;
+
+    private PingStatusTesterPool() {
+        // No instantiation
+    }
+
+    public static synchronized StatusTesterPool getInstance() {
+        if (INSTANCE == null) {
+            INSTANCE = new PingStatusTesterPool();
+        }
+
+        return INSTANCE;
+    }
+
+    @Override
+    public void scheduleStatusTest(Device device, DeviceStatusListener deviceStatusListener, StatusTestType statusTestType) {
+        synchronized (STATUS_LOCK) {
+            StatusTestItem statusTestItem;
+
+            if (statusCheckMap.containsKey(device.id) && statusCheckMap.get(device.id) != null) {
+                Log.w(getClass().getSimpleName(), "Another status check already running for device " + device.name);
+
+                statusTestItem = statusCheckMap.get(device.id);
+
+                if (statusTestItem == null) {
+                    throw new IllegalStateException("Item can not be null at this point");
+                }
+
+                statusTestItem.addOrReplaceStatusListener(statusTestType, deviceStatusListener);
+            } else {
+                statusTestItem = new StatusTestItem(device);
+                statusTestItem.addOrReplaceStatusListener(statusTestType, deviceStatusListener);
+            }
+
+            ScheduledFuture<?> scheduledFuture =
+                    EXECUTOR.scheduleWithFixedDelay(DEVICE_STATUS_TESTER.buildStatusTestCallable(device, statusTestItem),
+                            0, 2, TimeUnit.SECONDS);
+            statusTestItem.setOrUpdateRunnable(scheduledFuture);
+
+            statusCheckMap.put(device.id, statusTestItem);
+            Log.d(getClass().getSimpleName(), "Successfully scheduled new status check for device " + device.name + " of type " + statusTestType);
+            Log.d(getClass().getSimpleName(), "Total of " + statusCheckMap.size() + " status checks currently running");
+        }
+    }
+
+    @Override
+    public void stopStatusTest(Device device, StatusTestType testType) {
+        Log.d(getClass().getSimpleName(), "Stopping status checks for device " + device.name + " of type " + testType);
+
+        synchronized (STATUS_LOCK) {
+            StatusTestItem statusTestItem = statusCheckMap.get(device.id);
+
+            if (statusTestItem == null) {
+                return;
+            }
+
+            if (statusTestItem.removeListenerAndCancelIfApplicable(testType)) {
+                statusCheckMap.remove(device.id);
+            }
+        }
+    }
+
+    @Override
+    public void stopAllStatusTesters(StatusTestType testType) {
+        Log.d(getClass().getSimpleName(), "Stopping all status checks of type " + testType);
+
+        Map<Integer, StatusTestItem> updatedList = new HashMap<>(8);
+
+        synchronized (STATUS_LOCK) {
+            statusCheckMap.values().forEach(statusTestItem -> {
+                if (!statusTestItem.removeListenerAndCancelIfApplicable(testType)) {
+                    updatedList.put(statusTestItem.getDevice().id, statusTestItem);
+                }
+            });
+
+            statusCheckMap = updatedList;
+        }
+    }
+
+    @Override
+    public void pauseAllForType(StatusTestType testType) {
+        Log.i(getClass().getSimpleName(), "Pausing all pings of type " + testType);
+
+        synchronized (STATUS_LOCK) {
+            statusCheckMap.values().forEach(item -> item.pausePingRunnable(testType));
+        }
+    }
+
+    @Override
+    public void resumeAll() {
+        Log.i(getClass().getSimpleName(), "Resuming all previously scheduled pings");
+
+        synchronized (STATUS_LOCK) {
+            statusCheckMap.values().forEach(item -> {
+                Device device = item.getDevice();
+
+                ScheduledFuture<?> scheduledFuture =
+                        EXECUTOR.scheduleWithFixedDelay(DEVICE_STATUS_TESTER.buildStatusTestCallable(device, item),
+                                0, 2, TimeUnit.SECONDS);
+                item.setOrUpdateRunnable(scheduledFuture);
+            });
+        }
+    }
+
+}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTestItem.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTestItem.java
new file mode 100644
index 0000000..4c18c1a
--- /dev/null
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTestItem.java
@@ -0,0 +1,72 @@
+package de.florianisme.wakeonlan.ui.list.status.pool;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ScheduledFuture;
+import java.util.function.Consumer;
+
+import de.florianisme.wakeonlan.persistence.models.Device;
+import de.florianisme.wakeonlan.ui.list.status.DeviceStatusListener;
+
+public class StatusTestItem {
+
+    private final Device device;
+    private ScheduledFuture<?> runnable;
+
+    private final Map<StatusTestType, DeviceStatusListener> listeners = new HashMap<>(3);
+
+    public StatusTestItem(Device device) {
+        this.device = device;
+    }
+
+    void addOrReplaceStatusListener(StatusTestType testType, DeviceStatusListener deviceStatusListener) {
+        synchronized (listeners) {
+            listeners.put(testType, deviceStatusListener);
+        }
+    }
+
+    boolean removeListenerAndCancelIfApplicable(StatusTestType statusTestType) {
+        synchronized (listeners) {
+            listeners.remove(statusTestType);
+
+            if (listeners.isEmpty()) {
+                cancelRunnable();
+                return true;
+            }
+            return false;
+        }
+    }
+
+    void setOrUpdateRunnable(ScheduledFuture<?> scheduledFuture) {
+        if (this.runnable != null) {
+            cancelRunnable();
+        }
+        this.runnable = scheduledFuture;
+    }
+
+    private void cancelRunnable() {
+        this.runnable.cancel(true);
+    }
+
+    public synchronized void forAllListeners(Consumer<DeviceStatusListener> consumer) {
+        synchronized (listeners) {
+            listeners.values().forEach(consumer);
+        }
+    }
+
+    public Device getDevice() {
+        return device;
+    }
+
+    public void pausePingRunnable(StatusTestType testType) {
+        synchronized (listeners) {
+            if (runnableOnlyRunningForType(testType)) {
+                cancelRunnable();
+            }
+        }
+    }
+
+    private boolean runnableOnlyRunningForType(StatusTestType testType) {
+        return listeners.keySet().size() == 1 && listeners.containsKey(testType);
+    }
+}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTestType.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTestType.java
new file mode 100644
index 0000000..8e3327a
--- /dev/null
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTestType.java
@@ -0,0 +1,5 @@
+package de.florianisme.wakeonlan.ui.list.status.pool;
+
+public enum StatusTestType {
+    LIST, TILE, QUICK_ACCESS
+}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTesterPool.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTesterPool.java
new file mode 100644
index 0000000..ae794b7
--- /dev/null
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/status/pool/StatusTesterPool.java
@@ -0,0 +1,17 @@
+package de.florianisme.wakeonlan.ui.list.status.pool;
+
+import de.florianisme.wakeonlan.persistence.models.Device;
+import de.florianisme.wakeonlan.ui.list.status.DeviceStatusListener;
+
+public interface StatusTesterPool {
+
+    void scheduleStatusTest(Device device, DeviceStatusListener deviceStatusListener, StatusTestType testType);
+
+    void stopStatusTest(Device device, StatusTestType testType);
+
+    void stopAllStatusTesters(StatusTestType testType);
+
+    void pauseAllForType(StatusTestType testType);
+
+    void resumeAll();
+}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/list/viewholder/DeviceItemViewHolder.java b/app/src/main/java/de/florianisme/wakeonlan/ui/list/viewholder/DeviceItemViewHolder.java
index 5d69b38..74b6cc5 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/list/viewholder/DeviceItemViewHolder.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/list/viewholder/DeviceItemViewHolder.java
@@ -22,8 +22,8 @@
 import de.florianisme.wakeonlan.shutdown.ShutdownExecutor;
 import de.florianisme.wakeonlan.shutdown.ShutdownModelFactory;
 import de.florianisme.wakeonlan.ui.list.DeviceClickedCallback;
-import de.florianisme.wakeonlan.ui.list.status.DeviceStatusTester;
-import de.florianisme.wakeonlan.ui.list.status.PingDeviceStatusTester;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTestType;
+import de.florianisme.wakeonlan.ui.list.status.pool.StatusTesterPool;
 import de.florianisme.wakeonlan.ui.modify.EditDeviceActivity;
 import de.florianisme.wakeonlan.wol.WolSender;
 
@@ -37,9 +37,11 @@ public class DeviceItemViewHolder extends RecyclerView.ViewHolder {
     private final Button sendWolButton;
     private final Button shutdownButton;
     private final DeviceClickedCallback deviceClickedCallback;
-    private final DeviceStatusTester deviceStatusTester;
+    private final StatusTesterPool statusTesterPool;
 
-    public DeviceItemViewHolder(View view, DeviceClickedCallback deviceClickedCallback) {
+    private Device device;
+
+    public DeviceItemViewHolder(View view, DeviceClickedCallback deviceClickedCallback, StatusTesterPool statusTesterPool) {
         super(view);
         deviceStatus = view.findViewById(R.id.device_status);
         deviceName = view.findViewById(R.id.device_name);
@@ -49,15 +51,19 @@ public DeviceItemViewHolder(View view, DeviceClickedCallback deviceClickedCallba
         sendWolButton = view.findViewById(R.id.send_wol);
         shutdownButton = view.findViewById(R.id.shutdown);
         this.deviceClickedCallback = deviceClickedCallback;
-        this.deviceStatusTester = new PingDeviceStatusTester();
+        this.statusTesterPool = statusTesterPool;
     }
 
-    public void setDeviceName(String name) {
-        deviceName.setText(name);
-    }
+    public synchronized void fromDevice(Device device) {
+        this.device = device;
 
-    public void setDeviceMacAddress(String mac) {
-        deviceMacAddress.setText(mac);
+        deviceName.setText(device.name);
+        deviceMacAddress.setText(device.macAddress);
+
+        setOnClickHandler(device);
+        setOnEditClickHandler(device);
+        setShutdownVisibilityAndClickHandler(device);
+        startDeviceStatusQuery(device);
     }
 
     public void setOnClickHandler(Device device) {
@@ -73,7 +79,7 @@ public void setOnEditClickHandler(Device device) {
 
             Intent intent = new Intent(context, EditDeviceActivity.class);
             Bundle bundle = new Bundle();
-            bundle.putInt(EditDeviceActivity.MACHINE_ID_KEY, device.id);
+            bundle.putParcelable(EditDeviceActivity.DEVICE_PARCELABLE_KEY, device);
             intent.putExtras(bundle);
             context.startActivity(intent);
         });
@@ -96,7 +102,7 @@ public void startDeviceStatusQuery(Device device) {
         deviceStatus.clearAnimation();
         deviceStatus.setBackground(AppCompatResources.getDrawable(itemView.getContext(), R.drawable.device_status_unknown));
 
-        deviceStatusTester.scheduleDeviceStatusPings(device, status -> {
+        statusTesterPool.scheduleStatusTest(device, status -> {
             if (status == DeviceStatus.ONLINE) {
                 setAlphaAnimationIfNotSet();
                 setStatusDrawable(R.drawable.device_status_online);
@@ -107,7 +113,7 @@ public void startDeviceStatusQuery(Device device) {
                 deviceStatus.clearAnimation();
                 deviceStatus.setBackground(AppCompatResources.getDrawable(itemView.getContext(), R.drawable.device_status_unknown));
             }
-        });
+        }, StatusTestType.LIST);
     }
 
     private void setStatusDrawable(int statusDrawable) {
@@ -133,8 +139,8 @@ private void setAlphaAnimationIfNotSet() {
     }
 
     public void cancelStatusUpdates() {
-        if (deviceStatusTester != null) {
-            deviceStatusTester.stopDeviceStatusPings();
+        if (statusTesterPool != null && device != null) {
+            statusTesterPool.stopStatusTest(device, StatusTestType.LIST);
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/modify/AddDeviceActivity.java b/app/src/main/java/de/florianisme/wakeonlan/ui/modify/AddDeviceActivity.java
index 829a747..21e5724 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/modify/AddDeviceActivity.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/modify/AddDeviceActivity.java
@@ -62,6 +62,7 @@ protected Device buildDeviceFromInputs() {
     protected boolean inputsHaveNotChanged() {
         // There is no persisted device yet, so we check if any of our inputs are edited
         return getDeviceNameInputText().isEmpty() && getDeviceMacInputText().isEmpty()
+                && getPort() == 9
                 && getDeviceBroadcastAddressText().isEmpty() && getDeviceStatusIpText().isEmpty()
                 && getDeviceSecureOnPassword().isEmpty() && !getDeviceRemoteShutdownEnabled() &&
                 getDeviceSshAddress().isEmpty() && getDeviceSshPort() == -1 && getDeviceSshUsername().isEmpty() &&
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/modify/EditDeviceActivity.java b/app/src/main/java/de/florianisme/wakeonlan/ui/modify/EditDeviceActivity.java
index d3f043f..c3d274b 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/modify/EditDeviceActivity.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/modify/EditDeviceActivity.java
@@ -17,7 +17,7 @@
 
 public class EditDeviceActivity extends ModifyDeviceActivity {
 
-    public static final String MACHINE_ID_KEY = "machineId";
+    public static final String DEVICE_PARCELABLE_KEY = "machine";
     private Device device;
 
     @Override
@@ -29,24 +29,18 @@ protected void onCreate(Bundle savedInstanceState) {
     private void populateInputs() {
         Bundle extras = getIntent().getExtras();
         if (extras != null) {
-            int machineId = extras.getInt(MACHINE_ID_KEY, -1);
-            if (machineId == -1) {
+            device = extras.getParcelable(DEVICE_PARCELABLE_KEY);
+            if (device == null) {
                 Toast.makeText(this, R.string.edit_machine_error_loading, Toast.LENGTH_SHORT).show();
                 finish();
                 return;
             }
 
-            device = deviceRepository.getById(machineId);
-
             deviceNameInput.setText(device.name);
             deviceStatusIpInput.setText(device.statusIp);
             deviceMacInput.setText(device.macAddress);
             deviceBroadcastInput.setText(device.broadcastAddress);
-            if (device.port == 9) {
-                devicePorts.setText("9", false);
-            } else {
-                devicePorts.setText("7", false);
-            }
+            devicePorts.setText(String.valueOf(device.port));
             deviceSecureOnPassword.setText(device.secureOnPassword);
 
             deviceEnableRemoteShutdown.setChecked(device.remoteShutdownEnabled);
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/modify/ModifyDeviceActivity.java b/app/src/main/java/de/florianisme/wakeonlan/ui/modify/ModifyDeviceActivity.java
index 5cc3610..bfec233 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/ui/modify/ModifyDeviceActivity.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/modify/ModifyDeviceActivity.java
@@ -5,7 +5,6 @@
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.ImageButton;
 import android.widget.LinearLayout;
@@ -20,7 +19,6 @@
 import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import com.google.android.material.textfield.MaterialAutoCompleteTextView;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
@@ -50,6 +48,7 @@
 import de.florianisme.wakeonlan.ui.modify.watcher.validator.ConditionalInputNotEmptyValidator;
 import de.florianisme.wakeonlan.ui.modify.watcher.validator.InputNotEmptyValidator;
 import de.florianisme.wakeonlan.ui.modify.watcher.validator.MacValidator;
+import de.florianisme.wakeonlan.ui.modify.watcher.validator.PortValidator;
 import de.florianisme.wakeonlan.ui.modify.watcher.validator.SecureOnPasswordValidator;
 
 public abstract class ModifyDeviceActivity extends AppCompatActivity {
@@ -63,7 +62,7 @@ public abstract class ModifyDeviceActivity extends AppCompatActivity {
     protected TextInputEditText deviceBroadcastInput;
     protected TextInputEditText deviceSecureOnPassword;
     protected ImageButton broadcastAutofill;
-    protected MaterialAutoCompleteTextView devicePorts;
+    protected TextInputEditText devicePorts;
     protected ConstraintLayout deviceRemoteShutdownContainer;
     protected SwitchCompat deviceEnableRemoteShutdown;
     protected TextInputEditText deviceSshAddressInput;
@@ -106,7 +105,6 @@ protected void onCreate(Bundle savedInstanceState) {
         addValidators();
         addAutofillClickHandler();
         setRemoteDeviceShutdownSwitchListener();
-        addDevicePortsAdapter();
         setOnTestSshShutdownListenerClickedListener();
     }
 
@@ -129,6 +127,8 @@ private void addValidators() {
         deviceMacInput.addTextChangedListener(new MacValidator(deviceMacInput));
         deviceMacInput.addTextChangedListener(new MacAddressAutocomplete());
 
+        devicePorts.addTextChangedListener(new PortValidator(devicePorts));
+
         deviceNameInput.addTextChangedListener(new InputNotEmptyValidator(deviceNameInput, R.string.add_device_error_name_empty));
         deviceSecureOnPassword.addTextChangedListener(new SecureOnPasswordValidator(deviceSecureOnPassword));
 
@@ -148,6 +148,7 @@ private void addValidators() {
 
     protected boolean assertInputsNotEmptyAndValid() {
         return deviceMacInput.getError() == null && isNotEmpty(deviceMacInput) &&
+                devicePorts.getError() == null &&
                 deviceNameInput.getError() == null && isNotEmpty(deviceNameInput) &&
                 deviceStatusIpInput.getError() == null &&
                 deviceSecureOnPassword.getError() == null &&
@@ -165,13 +166,6 @@ private boolean isEmpty(TextInputEditText inputEditText) {
         return inputEditText.getText() == null || inputEditText.getText().length() == 0;
     }
 
-    private void addDevicePortsAdapter() {
-        ArrayAdapter<String> stringArrayAdapter = new ArrayAdapter<>(this, R.layout.modify_device_port_dropdown,
-                getResources().getStringArray(R.array.ports_selection));
-        devicePorts.setAdapter(stringArrayAdapter);
-        devicePorts.setText("9", false);
-    }
-
     protected void checkAndPersistDevice() {
         triggerValidators();
         if (assertInputsNotEmptyAndValid()) {
@@ -186,6 +180,7 @@ private void triggerValidators() {
         deviceNameInput.setText(deviceNameInput.getText());
         deviceBroadcastInput.setText(deviceBroadcastInput.getText());
         deviceMacInput.setText(deviceMacInput.getText());
+        devicePorts.setText(devicePorts.getText());
         deviceSecureOnPassword.setText(deviceSecureOnPassword.getText());
         deviceSshAddressInput.setText(deviceSshAddressInput.getText());
         deviceSshUsernameInput.setText(deviceSshUsernameInput.getText());
@@ -334,7 +329,15 @@ private TextView getResultMessageView(LinearLayout layout) {
     abstract protected boolean inputsHaveNotChanged();
 
     protected int getPort() {
-        return "7".equals(binding.device.devicePorts.getText().toString()) ? 7 : 9;
+        try {
+            String wakePort = getInputText(devicePorts);
+            if (Strings.nullToEmpty(wakePort).isEmpty()) {
+                return 9;
+            }
+            return Integer.parseInt(wakePort);
+        } catch (NumberFormatException e) {
+            return 9;
+        }
     }
 
     @NonNull
diff --git a/app/src/main/java/de/florianisme/wakeonlan/ui/modify/watcher/validator/PortValidator.java b/app/src/main/java/de/florianisme/wakeonlan/ui/modify/watcher/validator/PortValidator.java
new file mode 100644
index 0000000..052fb9b
--- /dev/null
+++ b/app/src/main/java/de/florianisme/wakeonlan/ui/modify/watcher/validator/PortValidator.java
@@ -0,0 +1,34 @@
+package de.florianisme.wakeonlan.ui.modify.watcher.validator;
+
+import android.widget.EditText;
+
+import com.google.common.base.Strings;
+
+import de.florianisme.wakeonlan.R;
+
+public class PortValidator extends Validator {
+
+    public PortValidator(EditText editTextView) {
+        super(editTextView);
+    }
+
+    @Override
+    public ValidationResult validate(String wakePort) {
+        try {
+            if (Strings.nullToEmpty(wakePort).isEmpty()) {
+                return ValidationResult.VALID;
+            }
+            int parsedPort = Integer.parseInt(wakePort);
+
+            return parsedPort > 0 && parsedPort <= 65535 ? ValidationResult.VALID : ValidationResult.INVALID;
+        } catch (NumberFormatException e) {
+            return ValidationResult.INVALID;
+        }
+    }
+
+    @Override
+    int getErrorMessageStringId() {
+        return R.string.add_device_error_port_invalid;
+    }
+
+}
diff --git a/app/src/main/java/de/florianisme/wakeonlan/wear/WearClient.java b/app/src/main/java/de/florianisme/wakeonlan/wear/WearClient.java
index 1f67ced..9f04b75 100644
--- a/app/src/main/java/de/florianisme/wakeonlan/wear/WearClient.java
+++ b/app/src/main/java/de/florianisme/wakeonlan/wear/WearClient.java
@@ -3,13 +3,14 @@
 import android.content.Context;
 import android.util.Log;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.android.gms.wearable.DataClient;
 import com.google.android.gms.wearable.PutDataMapRequest;
 import com.google.android.gms.wearable.PutDataRequest;
 import com.google.android.gms.wearable.Wearable;
+import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
 
+import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -38,8 +39,8 @@ private byte[] buildDevicesListByteArray(List<Device> devices) {
             List<DeviceDto> deviceDtos = devices.stream()
                     .map(device -> new DeviceDto(device.id, device.name))
                     .collect(Collectors.toList());
-            return new ObjectMapper().writeValueAsBytes(deviceDtos);
-        } catch (JsonProcessingException e) {
+            return new Gson().toJson(deviceDtos).getBytes(StandardCharsets.UTF_8);
+        } catch (JsonParseException e) {
             Log.e(getClass().getSimpleName(), "Could not transform list of devices to byte array", e);
             return new byte[0];
         }
diff --git a/app/src/main/res/drawable/ic_github_logo.xml b/app/src/main/res/drawable/ic_github_logo.xml
new file mode 100644
index 0000000..f0f4c70
--- /dev/null
+++ b/app/src/main/res/drawable/ic_github_logo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 0650348..3d83d1a 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -37,6 +37,7 @@
         android:layout_height="match_parent"
         android:layout_gravity="start"
         android:fitsSystemWindows="true"
+        app:headerLayout="@layout/header_navigation_drawer"
         app:itemIconTint="@drawable/drawer_item_color"
         app:itemTextColor="@drawable/drawer_item_color"
         app:menu="@menu/activity_main_drawer" />
diff --git a/app/src/main/res/layout/content_modify_device.xml b/app/src/main/res/layout/content_modify_device.xml
index 0f0d3c5..51bd4e5 100644
--- a/app/src/main/res/layout/content_modify_device.xml
+++ b/app/src/main/res/layout/content_modify_device.xml
@@ -72,37 +72,40 @@
             app:layout_constraintTop_toBottomOf="@id/device_title_connectivity"
             app:placeholderText="AB:12:CD:34:EF:56">
 
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/device_mac"
-            style="@style/FontMonospaced"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ems="10"
-            android:inputType="text"
-            android:minHeight="48dp"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/device_mac"
+                style="@style/FontMonospaced"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="text"
+                android:minHeight="48dp"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
 
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/device_port_layout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
-        android:layout_width="128dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="24dp"
-        android:hint="@string/add_device_port"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/device_title_connectivity">
-
-        <com.google.android.material.textfield.MaterialAutoCompleteTextView
-            android:id="@+id/device_ports"
-            style="@style/FontMonospaced"
-            android:layout_width="match_parent"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/device_port_layout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="128dp"
             android:layout_height="wrap_content"
-            android:inputType="none"
-            android:minHeight="48dp" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="24dp"
+            android:hint="@string/add_device_port"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/device_title_connectivity">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/device_ports"
+                style="@style/FontMonospaced"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:text="@string/add_device_default_port"
+                android:inputType="number"
+                android:minHeight="48dp"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/device_broadcast_layout"
@@ -141,43 +144,43 @@
             app:layout_constraintTop_toTopOf="@id/device_broadcast_layout"
             app:srcCompat="@drawable/ic_autofill_broadcast" />
 
-    <TextView
-        android:id="@+id/device_title_status"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        style="@style/FontMonospaced"
-        android:text="@string/device_title_status"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintTop_toBottomOf="@id/device_broadcast_layout"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/device_status_ip_layout"
-        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="24dp"
-        app:helperText="@string/add_device_status_ip_helper"
-        android:hint="@string/add_device_status_ip"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/device_title_status"
-        app:placeholderText="192.168.0.100">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/device_status_ip"
+        <TextView
+            android:id="@+id/device_title_status"
             style="@style/FontMonospaced"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="16dp"
+            android:text="@string/device_title_status"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/device_broadcast_layout" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/device_status_ip_layout"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:ems="10"
-            android:inputType="text"
-            android:minHeight="48dp"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginStart="8dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="24dp"
+            android:hint="@string/add_device_status_ip"
+            app:helperText="@string/add_device_status_ip_helper"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/device_title_status"
+            app:placeholderText="192.168.0.100">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/device_status_ip"
+                style="@style/FontMonospaced"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ems="10"
+                android:inputType="text"
+                android:minHeight="48dp"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
 
         <TextView
             android:id="@+id/device_title_remote_shutdown"
@@ -207,15 +210,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
-            android:textSize="12sp"
             android:text="@string/add_device_shutdown_explanation"
+            android:textSize="12sp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/device_switch_remote_shutdown" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/device_remote_shutdown_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/device_remote_shutdown_container"
             android:layout_marginTop="8dp"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/device_title_remote_shutdown_explanation">
@@ -345,13 +348,13 @@
 
             <Button
                 android:id="@+id/device_button_test_shutdown"
-                app:layout_constraintTop_toBottomOf="@id/device_remote_shutdown_command"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
                 android:layout_marginTop="8dp"
                 android:layout_marginEnd="24dp"
-                android:text="@string/modify_device_test_shutdown" />
+                android:text="@string/modify_device_test_shutdown"
+                app:layout_constraintTop_toBottomOf="@id/device_remote_shutdown_command" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/header_navigation_drawer.xml b/app/src/main/res/layout/header_navigation_drawer.xml
new file mode 100644
index 0000000..e957dc1
--- /dev/null
+++ b/app/src/main/res/layout/header_navigation_drawer.xml
@@ -0,0 +1,25 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/navigation_header_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:text="@string/app_name"
+        android:textAppearance="?attr/textAppearanceHeadline6" />
+
+    <TextView
+        android:id="@+id/navigation_header_version"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="24dp"
+        android:layout_marginEnd="24dp"
+        android:layout_marginBottom="24dp"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="@color/material_on_surface_emphasis_medium" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index c0d8053..6178abc 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -1,6 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <group android:checkableBehavior="single">
+    <group
+        android:id="@+id/drawer_base_categories"
+        android:checkableBehavior="single">
         <item
             android:id="@+id/deviceListFragment"
             android:icon="@drawable/ic_device_list"
@@ -13,7 +15,15 @@
             android:id="@+id/backupFragment"
             android:icon="@drawable/ic_import_export"
             android:title="@string/drawer_menu_item_backup" />
+    </group>
 
+    <group
+        android:id="@+id/drawer_other_categories"
+        android:checkableBehavior="single">
+        <item
+            android:id="@+id/githubShortcut"
+            android:icon="@drawable/ic_github_logo"
+            android:title="@string/drawer_menu_item_github" />
     </group>
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 1ba733a..29af519 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -70,6 +70,8 @@
     <string name="device_title_security">Sicherheit</string>
     <string name="add_device_secure_on">SecureOn Passwort (optional)</string>
     <string name="add_device_error_secure_on_password_invalid">Passwort muss entweder leer oder eine gültige MAC oder IP Adresse sein</string>
+    <string name="drawer_menu_item_github">Fehler melden</string>
+    <string name="drawer_menu_header_version">Version %1$s</string>
     <string name="quick_access_device_subtitle">Gerät einschalten</string>
     <string name="shortcut_wake_device_error">Gerät kann nicht geweckt werden</string>
     <string name="device_title_status">Status</string>
@@ -95,4 +97,5 @@
     <string name="test_shutdown_error_unknown_host">Unbekannter Hostname \"%1$s\"</string>
     <string name="add_device_status_ip_helper">Onlinestatus des Geräts wird regelmäßig unter dieser Adresse per Ping-Befehl abgefragt</string>
     <string name="add_device_shutdown_explanation">Nutzt SSH um sich am Zielsystem anzumelden und über das entsprechende Kommando herunterzufahren.\nFunktioniert nur auf Systemen, auf denen Linux betrieben wird.</string>
+    <string name="add_device_error_port_invalid">Ungültiger Port</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 125df87..dc2804c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,3 +1,4 @@
 <resources>
     <dimen name="fab_margin">16dp</dimen>
+    <dimen name="navigation_header_top_padding">24dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 35a0cce..95ac7fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
     <string name="add_device_status_ip">Status IP (optional)</string>
     <string name="add_device_status_ip_helper">Device will be regularly pinged at this address to display it\'s online status</string>
     <string name="add_device_mac_address">MAC Address</string>
+    <string name="add_device_default_port" translatable="false">9</string>
     <string name="add_device_port">Port</string>
     <string name="add_device_broadcast_address">Broadcast Address (optional)</string>
     <string name="add_device_autofill_broadcast">Autofill Broadcast Address</string>
@@ -32,12 +33,9 @@
     <string name="add_device_shutdown_command_helper">Command must be executable without triggering Interactive authentication (sudo password-prompt)</string>
     <string name="add_device_menu_save">Save</string>
     <string name="add_device_menu_delete">Delete</string>
-    <string-array name="ports_selection">
-        <item>9</item>
-        <item>7</item>
-    </string-array>
 
     <string name="add_device_error_mac_invalid">Invalid MAC Address</string>
+    <string name="add_device_error_port_invalid">Invalid Port</string>
     <string name="add_device_error_name_empty">Name must not be empty</string>
     <string name="add_device_error_ip_invalid">Invalid IP Address</string>
     <string name="add_device_error_secure_on_password_invalid">Password must be either empty, a valid MAC or IP Address</string>
@@ -99,6 +97,8 @@
     <string name="drawer_menu_item_device_list" translatable="false">@string/title_fragment_device_list</string>
     <string name="drawer_menu_item_scan" translatable="false">@string/title_fragment_network_scan</string>
     <string name="drawer_menu_item_backup" translatable="false">@string/title_fragment_backup</string>
+    <string name="drawer_menu_item_github">Report Issues</string>
+    <string name="drawer_menu_header_version">Version %1$s</string>
 
     <!-- Quick Access -->
     <string name="quick_access_device_subtitle">Wake device</string>
diff --git a/build.gradle b/build.gradle
index 557de3a..ca1466c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
+        classpath 'com.android.tools.build:gradle:8.1.4'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/ping/build.gradle b/ping/build.gradle
new file mode 100644
index 0000000..5fb1fbe
--- /dev/null
+++ b/ping/build.gradle
@@ -0,0 +1,19 @@
+apply plugin: 'com.android.library'
+
+android {
+    namespace 'de.florianisme.wakeonlan.ping'
+    compileSdk 34
+
+    defaultConfig {
+        minSdk 24
+        targetSdk 34
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
diff --git a/ping/src/main/java/de/florianisme/wakeonlan/ping/EchoPacketBuilder.java b/ping/src/main/java/de/florianisme/wakeonlan/ping/EchoPacketBuilder.java
new file mode 100644
index 0000000..c13e15e
--- /dev/null
+++ b/ping/src/main/java/de/florianisme/wakeonlan/ping/EchoPacketBuilder.java
@@ -0,0 +1,75 @@
+package de.florianisme.wakeonlan.ping;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.atomic.AtomicInteger;
+
+// Copied and modified from https://github.com/dburckh/AndroidPing/blob/master/lib/src/main/java/com/spectrum/android/ping/EchoPacketBuilder.java
+public class EchoPacketBuilder {
+
+    public static final int MAX_PAYLOAD = 65507;
+    public static final byte TYPE_ICMP_V4 = 8;
+    public static final byte TYPE_ICMP_V6 = (byte) 128;
+    private static final byte CODE = 0;
+
+    private final byte mType;
+    private final byte[] mPayload;
+    private short mSequenceNumber;
+    private short mIdentifier = 0xDBB;
+    private boolean mAutoIdentifier = true;
+
+    private static AtomicInteger sSequence = new AtomicInteger(0);
+
+    public EchoPacketBuilder(final byte type, final byte[] payload) {
+        mType = type;
+        if (payload == null) {
+            mPayload = new byte[0];
+        } else if (payload.length > MAX_PAYLOAD) {
+            throw new IllegalArgumentException("Payload limited to " + MAX_PAYLOAD);
+        } else {
+            mPayload = payload;
+        }
+    }
+
+    public ByteBuffer build() {
+        if (mAutoIdentifier) {
+            mIdentifier = (short) sSequence.getAndIncrement();
+        }
+        final byte buffer[] = new byte[8 + mPayload.length];
+        final ByteBuffer byteBuffer = ByteBuffer.wrap(buffer);
+
+        byteBuffer.put(mType);
+        byteBuffer.put(CODE);
+        final int checkPos = byteBuffer.position();
+        byteBuffer.position(checkPos + 2);
+        byteBuffer.putShort(mIdentifier);
+        byteBuffer.putShort(mSequenceNumber);
+        byteBuffer.put(mPayload);
+        byteBuffer.putShort(checkPos, checksum(buffer, buffer.length));
+        byteBuffer.flip();
+        return byteBuffer;
+    }
+
+    /**
+     * RFC 1071 checksum
+     *
+     * @param data
+     * @param end
+     * @return
+     */
+    static short checksum(byte[] data, int end) {
+        int sum = 0;
+        // High bytes (even indices)
+        for (int i = 0; i < end; i += 2) {
+            sum += (data[i] & 0xFF) << 8;
+            sum = (sum & 0xFFFF) + (sum >> 16);
+        }
+        // Low bytes (odd indices)
+        for (int i = 1; i < end; i += 2) {
+            sum += (data[i] & 0xFF);
+            sum = (sum & 0xFFFF) + (sum >> 16);
+        }
+        // Fix any one's-complement errors- sometimes it is necessary to rotate twice.
+        sum = (sum & 0xFFFF) + (sum >> 16);
+        return (short) (sum ^ 0xFFFF);
+    }
+}
\ No newline at end of file
diff --git a/ping/src/main/java/de/florianisme/wakeonlan/ping/Ping.java b/ping/src/main/java/de/florianisme/wakeonlan/ping/Ping.java
new file mode 100644
index 0000000..7da6452
--- /dev/null
+++ b/ping/src/main/java/de/florianisme/wakeonlan/ping/Ping.java
@@ -0,0 +1,203 @@
+package de.florianisme.wakeonlan.ping;
+
+import android.net.Network;
+import android.os.Build;
+import android.system.ErrnoException;
+import android.system.Os;
+import android.system.OsConstants;
+import android.system.StructPollfd;
+import android.util.Log;
+
+import java.io.FileDescriptor;
+import java.io.IOException;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.SocketException;
+import java.nio.ByteBuffer;
+
+// Copied and modified from https://github.com/dburckh/AndroidPing/blob/master/lib/src/main/java/com/spectrum/android/ping/Ping.java
+public class Ping {
+    public static final long TIMED_OUT_MS = -1;
+    private static final String TAG = Ping.class.getSimpleName();
+
+    private static final int IPTOS_LOWDELAY = 0x10;
+
+    private static final int ECHO_PORT = 7;
+    //POLLIN isn't populated correctly in test stubs
+    protected static final short POLLIN = (short) (OsConstants.POLLIN == 0 ? 1 : OsConstants.POLLIN);
+    private static final int MSG_DONTWAIT = 0x40;
+    private final InetAddress mDest;
+    private final PingListener mListener;
+
+    private int mTimeoutMs = 4000;
+    private EchoPacketBuilder mEchoPacketBuilder;
+    private Network mNetwork;
+
+    public interface PingListener {
+        /**
+         * Callback for ping
+         *
+         * @param timeMs time in ms for ping to return or @see Ping.TIMED_OUT_MS in case of timeout
+         */
+        void onPing(long timeMs);
+
+        /**
+         * Ping critical failure
+         *
+         * @param e
+         */
+        void onPingException(Exception e);
+    }
+
+    /**
+     * @param dest     Can be of type <code>Inet6Address</code> or <code>Inet4Address</code>
+     * @param listener
+     */
+    public Ping(final InetAddress dest, final PingListener listener) {
+        mDest = dest;
+        if (listener == null) {
+            throw new NullPointerException();
+        }
+        mListener = listener;
+        final byte type = dest instanceof Inet6Address ? EchoPacketBuilder.TYPE_ICMP_V6 : EchoPacketBuilder.TYPE_ICMP_V4;
+        setEchoPacketBuilder(new EchoPacketBuilder(type, "abcdefghijklmnopqrstuvwabcdefghi".getBytes()));
+    }
+
+    public void setTimeoutMs(final int timeoutMs) {
+        if (timeoutMs < 0) {
+            throw new IllegalArgumentException("Timeout must not be negative: " + timeoutMs);
+        }
+        mTimeoutMs = timeoutMs;
+    }
+
+    public int getTimeoutMs() {
+        return mTimeoutMs;
+    }
+
+    public Network getNetwork() {
+        return mNetwork;
+    }
+
+    public void setNetwork(final Network network) {
+        mNetwork = network;
+    }
+
+    public void setEchoPacketBuilder(final EchoPacketBuilder echoPacketBuilder) {
+        mEchoPacketBuilder = echoPacketBuilder;
+    }
+
+    /**
+     * Ping an IP address
+     *
+     * @return long[count] where -1 is timeout
+     * @throws ErrnoException
+     * @throws IOException
+     */
+    public void run() {
+        final int inet, proto;
+        if (mDest instanceof Inet6Address) {
+            inet = OsConstants.AF_INET6;
+            proto = OsConstants.IPPROTO_ICMPV6;
+        } else {
+            inet = OsConstants.AF_INET;
+            proto = OsConstants.IPPROTO_ICMP;
+        }
+        try {
+            final FileDescriptor fd = socket(inet, proto);
+            if (fd.valid()) {
+                try {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && mNetwork != null) {
+                        mNetwork.bindSocket(fd);
+                    }
+                    setLowDelay(fd);
+
+                    final StructPollfd structPollfd = new StructPollfd();
+                    structPollfd.fd = fd;
+                    structPollfd.events = POLLIN;
+                    final StructPollfd[] structPollfds = {structPollfd};
+                    final ByteBuffer byteBuffer = mEchoPacketBuilder.build();
+                    final byte[] buffer = new byte[byteBuffer.limit()];
+
+                    try {
+                        // Note: it appears that the OS updates the Checksum, Identifier, and Sequence number.  The payload appears to be untouched.
+                        // These changes are not reflected in the buffer, but in the returning packet.
+                        final long start = System.currentTimeMillis();
+                        int rc = sendto(fd, byteBuffer);
+                        if (rc >= 0) {
+                            rc = poll(structPollfds);
+                            final long time = calcLatency(start, System.currentTimeMillis());
+                            if (rc >= 0) {
+                                if (structPollfd.revents == POLLIN) {
+                                    structPollfd.revents = 0;
+                                    rc = recvfrom(fd, buffer);
+                                    if (rc < 0) {
+                                        Log.d(TAG, "recvfrom() return failure: " + rc);
+                                    }
+                                    mListener.onPing(time);
+                                } else {
+                                    mListener.onPing(TIMED_OUT_MS);
+                                }
+                            } else {
+                                mListener.onPingException(new IOException("poll() failed"));
+                            }
+                        } else {
+                            mListener.onPingException(new IOException("sendto() failed"));
+                        }
+                    } catch (ErrnoException e) {
+                        mListener.onPingException(e);
+                    }
+                } finally {
+                    close(fd);
+                }
+            } else {
+                mListener.onPingException(new IOException("Invalid FD " + fd));
+            }
+        } catch (ErrnoException | IOException e) {
+            mListener.onPingException(e);
+        }
+    }
+
+    /*
+     * Testability methods
+     */
+
+    protected long calcLatency(final long startTimestamp, final long endTimestamp) {
+        return endTimestamp - startTimestamp;
+    }
+
+    protected FileDescriptor socket(final int inet, final int proto) throws ErrnoException {
+        return Os.socket(inet, OsConstants.SOCK_DGRAM, proto);
+    }
+
+    protected void setLowDelay(final FileDescriptor fd) throws ErrnoException {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            Os.setsockoptInt(fd, OsConstants.IPPROTO_IP, OsConstants.IP_TOS, IPTOS_LOWDELAY);
+        } else {
+            try {
+                final Method method = Os.class.getMethod("setsockoptInt", FileDescriptor.class, int.class, int.class, int.class);
+                method.invoke(null, fd, OsConstants.IPPROTO_IP, OsConstants.IP_TOS, IPTOS_LOWDELAY);
+
+            } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException e) {
+                Log.e(TAG, "Could not setsockOptInt()", e);
+            }
+        }
+    }
+
+    protected int sendto(final FileDescriptor fd, final ByteBuffer byteBuffer) throws ErrnoException, SocketException {
+        return Os.sendto(fd, byteBuffer, 0, mDest, ECHO_PORT);
+    }
+
+    protected int poll(final StructPollfd[] structPollfds) throws ErrnoException {
+        return Os.poll(structPollfds, mTimeoutMs);
+    }
+
+    protected int recvfrom(final FileDescriptor fd, final byte[] buffer) throws ErrnoException, SocketException {
+        return Os.recvfrom(fd, buffer, 0, buffer.length, MSG_DONTWAIT, null);
+    }
+
+    protected void close(final FileDescriptor fd) throws ErrnoException {
+        Os.close(fd);
+    }
+}
\ No newline at end of file
diff --git a/proguard-rules.pro b/proguard-rules.pro
new file mode 100644
index 0000000..fe57dc5
--- /dev/null
+++ b/proguard-rules.pro
@@ -0,0 +1,46 @@
+-dontobfuscate
+-keepattributes SourceFile,LineNumberTable
+-keep class de.florianisme.wakeonlan.BuildConfig { *; }
+-dontwarn org.slf4j.**
+-dontwarn sun.security.x509.**
+
+-keep class de.florianisme.wakeonlan.models.DeviceDto { *; }
+
+-keep class org.bouncycastle.jcajce.provider.** { *; }
+-keep class org.bouncycastle.jce.provider.** { *; }
+
+-dontwarn javax.naming.**
+
+
+##---------------Begin: proguard configuration for Gson  ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { <fields>; }
+
+# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * extends com.google.gson.TypeAdapter
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+# Prevent R8 from leaving Data object members always null
+-keepclassmembers,allowobfuscation class * {
+  @com.google.gson.annotations.SerializedName <fields>;
+}
+
+# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
+
+##---------------End: proguard configuration for Gson  ----------
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index cde6449..149624c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,2 +1,2 @@
 rootProject.name = "WakeOnLan"
-include ':app', ':wear', ':shared-models'
\ No newline at end of file
+include ':app', ':wear', ':shared-models', 'ping'
\ No newline at end of file
diff --git a/shared-build.gradle b/shared-build.gradle
index e9e196e..83707d2 100644
--- a/shared-build.gradle
+++ b/shared-build.gradle
@@ -14,11 +14,26 @@ android {
         }
     }
 
+    buildTypes {
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+                    "$rootProject.projectDir/proguard-rules.pro"
+        }
+        debug {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+                    "$rootProject.projectDir/proguard-rules.pro"
+        }
+    }
+
     defaultConfig {
         applicationId "de.florianisme.wakeonlan"
         minSdk 24
         targetSdk 34
-        versionName "1.9.2"
+        versionName "1.9.7"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -44,8 +59,7 @@ dependencies {
 
     implementation 'com.google.guava:guava:31.0.1-jre'
 
-    //noinspection GradleDependency 2.15 required Java 19 which is not supported yet
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.2'
+    implementation 'com.google.code.gson:gson:2.10.1'
 
     testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.mockito:mockito-core:5.3.1'
diff --git a/shared-models/build.gradle b/shared-models/build.gradle
index 4276840..3c4bbb4 100644
--- a/shared-models/build.gradle
+++ b/shared-models/build.gradle
@@ -6,6 +6,5 @@ java {
 }
 
 dependencies {
-    //noinspection GradleDependency 2.15 required Java 19 which is not supported yet
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.2'
+    implementation 'com.google.code.gson:gson:2.10.1'
 }
\ No newline at end of file
diff --git a/shared-models/src/main/java/de/florianisme/wakeonlan/models/DeviceDto.java b/shared-models/src/main/java/de/florianisme/wakeonlan/models/DeviceDto.java
index 93b6d12..76bcf7a 100644
--- a/shared-models/src/main/java/de/florianisme/wakeonlan/models/DeviceDto.java
+++ b/shared-models/src/main/java/de/florianisme/wakeonlan/models/DeviceDto.java
@@ -1,20 +1,25 @@
 package de.florianisme.wakeonlan.models;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
+
+import com.google.gson.annotations.SerializedName;
 
 public class DeviceDto {
 
-    @JsonProperty("id")
-    private final int id;
+    @SerializedName("id")
+    private int id;
 
-    @JsonProperty("name")
-    private final String name;
+    @SerializedName("name")
+    private String name;
 
-    public DeviceDto(@JsonProperty("id") int id, @JsonProperty("name") String name) {
+    public DeviceDto(int id, String name) {
         this.id = id;
         this.name = name;
     }
 
+    @SuppressWarnings("unused")
+    public DeviceDto() {
+    }
+
     public int getId() {
         return id;
     }
diff --git a/wear/build.gradle b/wear/build.gradle
index f538182..3553257 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -5,7 +5,7 @@ android {
     compileSdk 33
     defaultConfig {
         targetSdk 33
-        versionCode 96
+        versionCode 106
     }
 }
 
diff --git a/wear/src/main/java/de/florianisme/wakeonlan/mobile/MobileClient.java b/wear/src/main/java/de/florianisme/wakeonlan/mobile/MobileClient.java
index 25a7d3a..999516c 100644
--- a/wear/src/main/java/de/florianisme/wakeonlan/mobile/MobileClient.java
+++ b/wear/src/main/java/de/florianisme/wakeonlan/mobile/MobileClient.java
@@ -2,7 +2,6 @@
 
 import android.net.Uri;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.android.gms.wearable.DataClient;
 import com.google.android.gms.wearable.DataItem;
 import com.google.android.gms.wearable.DataMap;
@@ -11,8 +10,11 @@
 import com.google.android.gms.wearable.Node;
 import com.google.android.gms.wearable.NodeClient;
 import com.google.android.gms.wearable.PutDataRequest;
+import com.google.gson.Gson;
+import com.google.gson.JsonParseException;
 
-import java.io.IOException;
+import java.io.ByteArrayInputStream;
+import java.io.InputStreamReader;
 import java.util.Arrays;
 import java.util.List;
 
@@ -64,8 +66,9 @@ public static List<DeviceDto> buildDeviceList(DataMap dataMap) throws DeviceQuer
         }
 
         try {
-            return Arrays.asList(new ObjectMapper().readValue(deviceListBytes, DeviceDto[].class));
-        } catch (IOException e) {
+            InputStreamReader inputStreamReader = new InputStreamReader(new ByteArrayInputStream(deviceListBytes));
+            return Arrays.asList(new Gson().fromJson(inputStreamReader, DeviceDto[].class));
+        } catch (JsonParseException e) {
             throw new DeviceQueryException("Devices can not be parsed", e);
         }
     }