diff --git a/lib/servers/configuration.ex b/lib/servers/configuration.ex
index 3b8b008..2b026ce 100644
--- a/lib/servers/configuration.ex
+++ b/lib/servers/configuration.ex
@@ -236,10 +236,10 @@ defmodule Amethyst.Server.Configuration do
   defp handle_plugin_message("minecraft:brand", data, _client, state) do
     {[brand], ""} = Read.start(data) |> Read.string |> Read.stop
     Logger.info("Client using brand: #{brand}")
-    {:ok, [{:brand, brand} | state]}
+    {:ok, Keyword.put(state, :brand, brand)}
   end
   defp handle_plugin_message("amethyst:hello", _data, _client, state) do
     Logger.info("Client is Amethyst aware! Hello!")
-    {:ok, [{:amethyst, true} | state]}
+    {:ok, Keyword.put(state, :knows_amethyst, true)}
   end
 end
diff --git a/lib/servers/generic.ex b/lib/servers/generic.ex
index 943110e..44e4956 100644
--- a/lib/servers/generic.ex
+++ b/lib/servers/generic.ex
@@ -53,6 +53,7 @@ require Logger
       @spec serve(:gen_tcp.socket()) :: no_return()
       def serve(client, state \\ []) do
         {id, data} = Amethyst.Server.Generic.get_packet(client)
+        Logger.debug("State: #{inspect(state)}")
         packet = deserialize(id, data)
         Logger.debug("Got packet #{inspect(packet)}")
         {result, state} = handle(packet, client, state)