diff --git a/common/pom.xml b/common/pom.xml
index 1f6c20b7e..0a47fbcaa 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -18,5 +18,11 @@
             <version>2.8.2</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>2.9.8</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java b/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java
new file mode 100644
index 000000000..ee14fc90b
--- /dev/null
+++ b/common/src/main/java/org/geysermc/floodgate/util/DeviceOS.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019-2020 GeyserMC. http://geysermc.org
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @author GeyserMC
+ * @link https://github.com/GeyserMC/Geyser
+ */
+
+package org.geysermc.floodgate.util;
+
+import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
+
+public enum DeviceOS {
+
+    @JsonEnumDefaultValue
+    UNKNOWN,
+    ANDROID,
+    IOS,
+    OSX,
+    FIREOS,
+    GEARVR,
+    HOLOLENS,
+    WIN10,
+    WIN32,
+    DEDICATED,
+    ORBIS,
+    NX,
+    SWITCH;
+
+    private static final DeviceOS[] VALUES = values();
+
+    public static DeviceOS getById(int id) {
+        return id < VALUES.length ? VALUES[id] : VALUES[0];
+    }
+}
\ No newline at end of file
diff --git a/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java b/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
index 3793e5227..66536e069 100644
--- a/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
+++ b/connector/src/main/java/org/geysermc/connector/network/session/auth/BedrockClientData.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonEnumDefaultValue;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
+import org.geysermc.floodgate.util.DeviceOS;
 
 import java.util.UUID;
 
@@ -65,23 +66,6 @@ public class BedrockClientData {
         POCKET
     }
 
-    public enum DeviceOS {
-        @JsonEnumDefaultValue
-        UNKOWN,
-        ANDROID,
-        IOS,
-        OSX,
-        FIREOS,
-        GEARVR,
-        HOLOLENS,
-        WIN10,
-        WIN32,
-        DEDICATED,
-        ORBIS,
-        NX,
-        SWITCH
-    }
-
     public enum InputMode {
         @JsonEnumDefaultValue
         UNKNOWN,