diff --git a/macros/node-poll-variants/src/lib.rs b/macros/node-poll-variants/src/lib.rs
index e968db1..b8e4015 100644
--- a/macros/node-poll-variants/src/lib.rs
+++ b/macros/node-poll-variants/src/lib.rs
@@ -3,10 +3,11 @@ use quote::quote;
 use std::ops::Deref;
 use syn::__private::Span;
 use syn::punctuated::Punctuated;
-use syn::token::{Colon, PathSep, Plus};
+use syn::token::{Colon, Comma, PathSep, Plus};
 use syn::{
-    parse_macro_input, parse_quote, Data, DeriveInput, Expr, GenericParam, Ident, Lit, Meta, Path,
-    PathSegment, Token, TraitBound, TraitBoundModifier, TypeParam, TypeParamBound,
+    parse_macro_input, parse_quote, parse_quote_spanned, Data, DeriveInput, Expr, GenericParam,
+    Generics, Ident, Lit, Meta, Path, PathSegment, Token, TraitBound, TraitBoundModifier,
+    TypeParam, TypeParamBound,
 };
 
 // Struct name: Ads1256PollStateful, Ads1256PollPublish, Ads1256PollStatePub
@@ -126,19 +127,37 @@ pub fn poll_variant_macro(input: TokenStream) -> TokenStream {
     let (publ_impl_generics, publ_type_generics, publ_where_clause) =
         &publish_generics.split_for_impl();
 
-    let stateful_ident = Ident::new(format!("{ident}Stateful").deref(), ident.span());
-    let publish_ident = Ident::new(format!("{ident}Publish").deref(), ident.span());
-    let state_pub_ident = Ident::new(format!("{ident}StatePub").deref(), ident.span());
+    let pubsub_error_path: Path = parse_quote!(embassy_sync::pubsub::Error);
+    let pubsub_sub_path: Path = parse_quote!(embassy_sync::pubsub::Subscriber);
+
+    let stateful_variant_ident = Ident::new(format!("{ident}Stateful").deref(), ident.span());
+    let publish_variant_ident = Ident::new(format!("{ident}Publish").deref(), ident.span());
+    let state_pub_variant_ident = Ident::new(format!("{ident}StatePub").deref(), ident.span());
+
+    let poll_path: Path = parse_quote!(physical_node::transducer::input::Poll);
+    let stateful_path: Path = parse_quote!(physical_node::transducer::Stateful);
+    let publish_path: Path = parse_quote!(physical_node::transducer::Publish);
 
     let expanded = quote! {
         // ----- Stateful struct ----------------------------------
-        #vis struct #stateful_ident #og_generics #og_where_clause {
+        #vis struct #stateful_variant_ident #og_generics #og_where_clause {
             pub poll: #ident #og_type_generics,
             pub state: physical_node::transducer::State<#value_type_ident>,
         }
 
         // ----- Stateful impls ----------------------------------
-        impl #og_impl_generics physical_node::transducer::Stateful for #stateful_ident #og_type_generics #og_where_clause {
+        impl #og_impl_generics #poll_path for #stateful_variant_ident #og_type_generics #og_where_clause {
+            type Value = #value_type_ident;
+
+            #[inline(always)]
+            async fn poll(&self) -> Self::Value {
+                let value = self.poll.poll().await;
+                self.state.update(value);
+                value
+            }
+        }
+
+        impl #og_impl_generics #stateful_path for #stateful_variant_ident #og_type_generics #og_where_clause {
             type Value = #value_type_ident;
 
             #[inline(always)]
@@ -152,25 +171,37 @@ pub fn poll_variant_macro(input: TokenStream) -> TokenStream {
             }
         }
 
-        impl #og_impl_generics physical_node::transducer::input::Poll for #stateful_ident #og_type_generics #og_where_clause {
-            type Value = #value_type_ident;
-
-            #[inline(always)]
-            async fn poll(&self) -> Self::Value {
-                let value = self.poll.poll().await;
-                self.state.update(value);
-                value
-            }
-        }
-
         // ----- Publish struct ----------------------------------
         //#[cfg(feature = "embassy-sync")]
-        #vis struct #publish_ident #publish_generics #publ_where_clause {
+        #vis struct #publish_variant_ident #publish_generics #publ_where_clause {
             pub poll: #ident #og_type_generics,
             pub publisher: physical_node::transducer::Publisher<#value_type_ident, #mutex_t_ident, #capacity_ident, #num_subs_ident>,
         }
 
         // ----- Publish impl ----------------------------------
+        //#[cfg(feature = "embassy-sync")]
+        impl #publ_impl_generics #poll_path for #publish_variant_ident #publ_type_generics #publ_where_clause {
+            type Value = #value_type_ident;
+
+            #[inline(always)]
+            async fn poll(&self) -> Self::Value {
+                let value = self.poll.poll().await;
+                self.publisher.update(value);
+                value
+            }
+        }
+
+        impl #publ_impl_generics #publish_path<#capacity_ident, #num_subs_ident> for #publish_variant_ident #publ_type_generics #publ_where_clause {
+            type Value = #value_type_ident;
+            type Mutex = #mutex_t_ident;
+
+                #[inline(always)]
+                fn subscribe(
+                    &self,
+                ) -> Result<#pubsub_sub_path<Self::Mutex, Self::Value, #capacity_ident, #num_subs_ident, 0>, #pubsub_error_path> {
+                    self.publisher.subscribe()
+            }
+        }
 
         // ----- StatePub struct ----------------------------------