diff --git a/lib/graphql/resolver.ex b/lib/graphql/resolver.ex
index 76e8d859..d776beac 100644
--- a/lib/graphql/resolver.ex
+++ b/lib/graphql/resolver.ex
@@ -507,62 +507,98 @@ defmodule AshGraphql.Graphql.Resolver do
   end
 
   def resolve(
-        %{arguments: arguments, context: context, root_value: notification} = resolution,
+        %{arguments: args, context: context, root_value: notification} = resolution,
         {domain, resource,
-         %AshGraphql.Resource.Subscription{read_action: read_action, name: name} = subscription,
-         _input?}
+         %AshGraphql.Resource.Subscription{read_action: read_action, name: name}, _input?}
       ) do
-    dbg(NOTIFICATION: notification)
-    data = notification.data
+    case handle_arguments(resource, read_action, args) do
+      {:ok, args} ->
+        metadata = %{
+          domain: domain,
+          resource: resource,
+          resource_short_name: Ash.Resource.Info.short_name(resource),
+          actor: Map.get(context, :actor),
+          tenant: Map.get(context, :tenant),
+          action: read_action,
+          source: :graphql,
+          subscription: name,
+          authorize?: AshGraphql.Domain.Info.authorize?(domain)
+        }
 
-    read_action =
-      read_action || Ash.Resource.Info.primary_action!(resource, :read).name
+        trace domain,
+              resource,
+              :gql_subscription,
+              name,
+              metadata do
+          opts = [
+            actor: Map.get(context, :actor),
+            action: read_action,
+            authorize?: AshGraphql.Domain.Info.authorize?(domain),
+            tenant: Map.get(context, :tenant)
+          ]
 
-    query =
-      Ash.Resource.Info.primary_key(resource)
-      |> Enum.reduce(resource, fn key, query ->
-        value = Map.get(data, key)
-        Ash.Query.filter(query, ^ref(key) == ^value)
-      end)
+          data = notification.data
 
-    query =
-      Ash.Query.do_filter(query, massage_filter(query.resource, Map.get(arguments, :filter)))
+          read_action =
+            read_action || Ash.Resource.Info.primary_action!(resource, :read).name
 
-    query =
-      AshGraphql.Subscription.query_for_subscription(
-        query
-        |> Ash.Query.for_read(read_action, %{},
-          actor: Map.get(context, :actor),
-          tenant: Map.get(context, :tenant)
-        ),
-        domain,
-        resolution,
-        "#{name}_result",
-        [to_string(notification.action.type) <> "d"]
-      )
+          query =
+            Ash.Resource.Info.primary_key(resource)
+            |> Enum.reduce(resource, fn key, query ->
+              value = Map.get(data, key)
+              Ash.Query.filter(query, ^ref(key) == ^value)
+            end)
 
-    case query |> Ash.read_one() do
-      # should only happen if a resource is created/updated and the subscribed user is not allowed to see it
-      {:ok, nil} ->
-        resolution
-        |> Absinthe.Resolution.put_result(
-          {:error, to_errors([Ash.Error.Query.NotFound.exception()], context, domain)}
-        )
+          query =
+            Ash.Query.do_filter(
+              query,
+              massage_filter(query.resource, Map.get(args, :filter))
+            )
 
-      {:ok, result} ->
-        dbg(result)
+          query =
+            AshGraphql.Subscription.query_for_subscription(
+              query
+              |> Ash.Query.for_read(read_action, %{}, opts),
+              domain,
+              resolution,
+              "#{name}_result",
+              [subcription_field_from_action_type(notification.action.type)]
+            )
 
-        resolution
-        |> Absinthe.Resolution.put_result(
-          {:ok, %{String.to_existing_atom(to_string(notification.action.type) <> "d") => result}}
-        )
+          case query |> Ash.read_one() do
+            # should only happen if a resource is created/updated and the subscribed user is not allowed to see it
+            {:ok, nil} ->
+              resolution
+              |> Absinthe.Resolution.put_result(
+                {:error, to_errors([Ash.Error.Query.NotFound.exception()], context, domain)}
+              )
+
+            {:ok, result} ->
+              resolution
+              |> Absinthe.Resolution.put_result(
+                {:ok,
+                 %{
+                   String.to_existing_atom(
+                     subcription_field_from_action_type(notification.action.type)
+                   ) => result
+                 }}
+              )
+
+            {:error, error} ->
+              resolution
+              |> Absinthe.Resolution.put_result({:error, to_errors([error], context, domain)})
+          end
+        end
 
       {:error, error} ->
-        resolution
-        |> Absinthe.Resolution.put_result({:error, to_errors([error], context, domain)})
+        {:error, error}
     end
   end
 
+  defp subcription_field_from_action_type(:create), do: "created"
+  defp subcription_field_from_action_type(:update), do: "updated"
+  defp subcription_field_from_action_type(:destroy), do: "destroyed"
+
   defp read_one_query(resource, args) do
     case Map.fetch(args, :filter) do
       {:ok, filter} when filter != %{} ->
diff --git a/lib/resource/resource.ex b/lib/resource/resource.ex
index 22fc2a8f..f54a6da1 100644
--- a/lib/resource/resource.ex
+++ b/lib/resource/resource.ex
@@ -1100,18 +1100,27 @@ defmodule AshGraphql.Resource do
     end)
   end
 
+  @doc false
+  # sobelow_skip ["DOS.StringToAtom"]
   def subscription_types(resource, _all_domains, schema) do
     resource
     |> subscriptions()
     |> Enum.map(fn %Subscription{name: name} ->
       resource_type = AshGraphql.Resource.Info.type(resource)
 
-      result_type = name |> to_string() |> then(&(&1 <> "_result")) |> String.to_atom()
+      result_type_name =
+        name
+        |> to_string()
+        |> then(&(&1 <> "_result"))
+
+      result_type =
+        result_type_name
+        |> String.to_atom()
 
       %Absinthe.Blueprint.Schema.ObjectTypeDefinition{
         module: schema,
         identifier: result_type,
-        name: name |> to_string() |> then(&(&1 <> "_result")) |> Macro.camelize(),
+        name: result_type_name,
         fields: [
           %Absinthe.Blueprint.Schema.FieldDefinition{
             __reference__: ref(__ENV__),