diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/AtoDPinSetupCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/AtoDPinSetupCommand.hpp
index 240ee457f..96522bf6b 100644
--- a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/AtoDPinSetupCommand.hpp
+++ b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/AtoDPinSetupCommand.hpp
@@ -18,7 +18,7 @@ namespace Zscript {
 namespace pins_module {
 
 template<class ZP>
-class AtoDPinSetupCommand {
+class AtoDPinSetupCommand: public AToDSetup_CommandDefs {
     static constexpr char ParamPin__P = 'P';
     static constexpr char ParamEnableNotifications__N = 'N';
     static constexpr char ParamLowerLimit__L = 'L';
diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinReadCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinReadCommand.hpp
index 651d82055..36adbd0c8 100644
--- a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinReadCommand.hpp
+++ b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinReadCommand.hpp
@@ -18,7 +18,7 @@ namespace Zscript {
 namespace pins_module {
 
 template<class ZP>
-class DigitalPinReadCommand {
+class DigitalPinReadCommand: public DigitalRead_CommandDefs {
     static constexpr char ParamPin__P = 'P';
 
     static constexpr char RespValue__V = 'V';
diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinWriteCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinWriteCommand.hpp
index 1bca444f7..a0638569e 100644
--- a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinWriteCommand.hpp
+++ b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DigitalPinWriteCommand.hpp
@@ -18,7 +18,7 @@ namespace Zscript {
 namespace pins_module {
 
 template<class ZP>
-class DigitalPinWriteCommand {
+class DigitalPinWriteCommand: public DigitalWrite_CommandDefs {
     static constexpr char ParamPin__P = 'P';
     static constexpr char ParamValue__V = 'V';
 
diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinSetupCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinSetupCommand.hpp
index 6a0c90cef..6e80d16f1 100644
--- a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinSetupCommand.hpp
+++ b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinSetupCommand.hpp
@@ -18,7 +18,7 @@ namespace Zscript {
 namespace pins_module {
 
 template<class ZP>
-class DtoAPinSetupCommand {
+class DtoAPinSetupCommand: public DToASetup_CommandDefs {
     static constexpr char ParamPin__P = 'P';
 
     static constexpr char RespBitCount__B = 'B';
diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinWriteCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinWriteCommand.hpp
index a052027fe..73925fe11 100644
--- a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinWriteCommand.hpp
+++ b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/DtoAPinWriteCommand.hpp
@@ -18,12 +18,11 @@ namespace Zscript {
 namespace pins_module {
 
 template<class ZP>
-class DtoAPinWriteCommand {
+class DtoAPinWriteCommand: public AnalogWrite_CommandDefs {
     static constexpr char ParamPin__P = 'P';
     static constexpr char ParamValue__V = 'V';
 
 public:
-
     static void execute(ZscriptCommandContext<ZP> ctx) {
         uint16_t pin;
         if (!ctx.getField(ParamPin__P, &pin)) {
diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinSetupCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinSetupCommand.hpp
index afc2e117e..d778d95b9 100644
--- a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinSetupCommand.hpp
+++ b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinSetupCommand.hpp
@@ -18,7 +18,7 @@ namespace Zscript {
 namespace pins_module {
 
 template<class ZP>
-class PwmPinSetupCommand {
+class PwmPinSetupCommand: public PwmSetup_CommandDefs {
     static constexpr char ParamPin__P = 'P';
 
     static constexpr char RespBitCount__B = 'B';
diff --git a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinWriteCommand.hpp b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinWriteCommand.hpp
index eaf5e5cf8..8c91e26ce 100644
--- a/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinWriteCommand.hpp
+++ b/receivers/native/arduino/src/main/c++/arduino/pins-module/commands/PwmPinWriteCommand.hpp
@@ -18,7 +18,7 @@ namespace Zscript {
 namespace pins_module {
 
 template<class ZP>
-class PwmPinWriteCommand {
+class PwmPinWriteCommand: public PwmWrite_CommandDefs {
     static constexpr char ParamPin__P = 'P';
     static constexpr char ParamValue__V = 'V';