diff --git a/lib/contrib/fortune.ex b/lib/contrib/fortune.ex
index bc17c70..773deb3 100644
--- a/lib/contrib/fortune.ex
+++ b/lib/contrib/fortune.ex
@@ -1,5 +1,5 @@
 defmodule Omnibot.Contrib.Fortune do
-  use Omnibot.Plugin
+  use Omnibot.Plugin.GenServer
 
   @fortunes [
     "Reply hazy, try again",
diff --git a/lib/contrib/linkbot.ex b/lib/contrib/linkbot.ex
index de6af26..1c51045 100644
--- a/lib/contrib/linkbot.ex
+++ b/lib/contrib/linkbot.ex
@@ -1,5 +1,5 @@
 defmodule Omnibot.Contrib.Linkbot do
-  use Omnibot.Plugin
+  use Omnibot.Plugin.GenServer
   require Logger
 
   @default_config timeout: 30_000
diff --git a/lib/contrib/markov/markov.ex b/lib/contrib/markov/markov.ex
index e8673b2..b19305e 100644
--- a/lib/contrib/markov/markov.ex
+++ b/lib/contrib/markov/markov.ex
@@ -6,9 +6,9 @@ defmodule Omnibot.Contrib.Markov do
   @default_config path: "markov", order: 2, save_every: 5 * 60
 
   @impl true
-  def children(_cfg, _state) do
+  def children(cfg, _state) do
     [{Task, fn ->
-      Stream.timer(1000)
+      Stream.timer(cfg[:save_every] * 1000)
       |> Stream.cycle()
       |> Stream.each(fn _ -> save_chains() end)
       |> Stream.run()
diff --git a/lib/contrib/on_connect.ex b/lib/contrib/on_connect.ex
index 4122159..a732a06 100644
--- a/lib/contrib/on_connect.ex
+++ b/lib/contrib/on_connect.ex
@@ -1,5 +1,5 @@
 defmodule Omnibot.Contrib.OnConnect do
-  use Omnibot.Plugin
+  use Omnibot.Plugin.GenServer
   require Logger
 
   @default_config [channels: :all, commands: []]
diff --git a/lib/core.ex b/lib/core.ex
index db05f60..257e9b0 100644
--- a/lib/core.ex
+++ b/lib/core.ex
@@ -1,5 +1,5 @@
 defmodule Omnibot.Core do
-  use Omnibot.Plugin
+  use Omnibot.Plugin.GenServer
   alias Omnibot.State
 
   @default_config [channels: :all]
diff --git a/lib/plugin/gen_server.ex b/lib/plugin/gen_server.ex
index 3b68d60..5842e7f 100644
--- a/lib/plugin/gen_server.ex
+++ b/lib/plugin/gen_server.ex
@@ -1,7 +1,7 @@
 defmodule Omnibot.Plugin.GenServer do
   defmacro __using__([]) do
     quote do
-      alias Omnibot.Plugin
+      use Omnibot.Plugin.Base
       use GenServer 
 
       def start_link(opts) do
diff --git a/lib/plugin/plugin.ex b/lib/plugin/plugin.ex
deleted file mode 100644
index b90c06c..0000000
--- a/lib/plugin/plugin.ex
+++ /dev/null
@@ -1,8 +0,0 @@
-defmodule Omnibot.Plugin do
-  defmacro __using__([]) do
-    quote do
-      use Omnibot.Plugin.Base
-      use Omnibot.Plugin.GenServer
-    end
-  end
-end