diff --git a/core/src/com/riiablo/Client.java b/core/src/com/riiablo/Client.java
index 6cc7a092..2470a262 100644
--- a/core/src/com/riiablo/Client.java
+++ b/core/src/com/riiablo/Client.java
@@ -111,6 +111,7 @@ public class Client extends Game {
   private Cursor                cursor;
   private CharData              charData;
   private D2                    anim;
+  private Metrics metrics;
 
   private boolean forceWindowed;
   private boolean forceDrawFps;
@@ -279,6 +280,7 @@ public class Client extends Game {
     Riiablo.cursor = cursor = new Cursor();
     Riiablo.charData = charData = CharData.obtain();
     Riiablo.anim = anim = D2.loadFromFile(mpqs.resolve("data\\global\\eanimdata.d2"));
+    Riiablo.metrics = metrics = new Metrics();
 
     Collection<Throwable> throwables;
     Riiablo.commands = commands = new GdxCommandManager();
@@ -445,8 +447,8 @@ public class Client extends Game {
     StringBuilder builder = new StringBuilder(64);
     builder
         .append(Gdx.graphics.getFramesPerSecond())
-        .append('\n').append("Ping: ").append(Riiablo.ping).append(" ms")
-        .append('\n').append("RTT: ").append(Riiablo.rtt).append(" ms")
+        .append('\n').append("Ping: ").append(Riiablo.metrics.ping).append(" ms")
+        .append('\n').append("RTT: ").append(Riiablo.metrics.rtt).append(" ms")
         ;
     fps.setText(font, builder.toString());
     int drawFpsMethod = this.drawFpsMethod;
@@ -517,6 +519,7 @@ public class Client extends Game {
     Riiablo.cursor = cursor;
     Riiablo.charData = charData;
     Riiablo.anim = anim;
+    Riiablo.metrics = metrics;
     super.resume();
   }
 
diff --git a/core/src/com/riiablo/Metrics.java b/core/src/com/riiablo/Metrics.java
new file mode 100644
index 00000000..9703b0f8
--- /dev/null
+++ b/core/src/com/riiablo/Metrics.java
@@ -0,0 +1,8 @@
+package com.riiablo;
+
+public class Metrics {
+  public long ping;
+  public long rtt;
+
+  public Metrics() {}
+}
diff --git a/core/src/com/riiablo/Riiablo.java b/core/src/com/riiablo/Riiablo.java
index 35e77d55..91d0dfc7 100644
--- a/core/src/com/riiablo/Riiablo.java
+++ b/core/src/com/riiablo/Riiablo.java
@@ -69,6 +69,5 @@ public class Riiablo {
   public static World                 engine;
   public static GameScreen            game;
   public static D2                    anim;
-  public static long                  ping;
-  public static long                  rtt;
+  public static Metrics metrics;
 }
diff --git a/core/src/com/riiablo/engine/client/Pinger.java b/core/src/com/riiablo/engine/client/Pinger.java
index c73d0e22..61622f7b 100644
--- a/core/src/com/riiablo/engine/client/Pinger.java
+++ b/core/src/com/riiablo/engine/client/Pinger.java
@@ -55,7 +55,7 @@ public class Pinger extends IntervalSystem {
   }
 
   public void Ping(Ping packet) {
-    Riiablo.ping = TimeUtils.millis() - packet.sendTime() - packet.processTime();
-    Riiablo.rtt = TimeUtils.millis() - packet.sendTime();
+    Riiablo.metrics.ping = TimeUtils.millis() - packet.sendTime() - packet.processTime();
+    Riiablo.metrics.rtt = TimeUtils.millis() - packet.sendTime();
   }
 }