   * `last_id`      - the last id received in the transport
   """
   def add(transport, token, last_id \\ nil) do
-    :gen_server.call name(token), {:add, transport, last_id}
+    token
+      |> extract_name
+      |> :gen_server.call {:add, transport, last_id}
   end
 
   @doc """

  * `response`     - Document in json
  """
  def notify(token, id, response) do
    case Process.whereis(name(token)) do
      pid -> :gen_server.cast pid, {:notify, id, response}
    end
  end

    transports
  end

  defp extract_name(token) do
    token |> binary_to_atom
  end

  defp find_or_start(name) do
