diff --git a/expanders_init.h b/expanders_init.h
index 446adbb..d38e450 100644
--- a/expanders_init.h
+++ b/expanders_init.h
@@ -31,7 +31,7 @@ extern void board_ports_init (void); // default is a weak function
 
 // I2C expanders
 
-#if PCA9654E_ENABLE || MCP3221_ENABLE || MCP4725_ENABLE
+#if PCA9654E_ENABLE || MCP3221_ENABLE || MCP4725_ENABLE || FLEXGPIO_ENABLE
 
 #if defined(I2C_ENABLE) && !I2C_ENABLE
 #undef I2C_ENABLE
@@ -55,6 +55,10 @@ extern void pca9654e_init(void);
 
 // Third party I2C expander plugins goes after this line
 
+#if FLEXGPIO_ENABLE
+extern void flexgpio_init (void);
+#endif
+
 #endif // I2C expanders
 
 // SPI expanders
@@ -112,4 +116,8 @@ static inline void io_expanders_init (void)
 #if PICOHAL_IO_ENABLE
     picohal_io_init();
 #endif
+
+#if FLEXGPIO_ENABLE
+    flexgpio_init ();
+#endif
 }
diff --git a/pin_bits_masks.h b/pin_bits_masks.h
index 223a8e4..3c3256a 100644
--- a/pin_bits_masks.h
+++ b/pin_bits_masks.h
@@ -440,6 +440,24 @@ static aux_ctrl_out_t aux_ctrl_out[] = {
 #if defined(Z_ENABLE_PIN) && Z_ENABLE_PORT == EXPANDER_PORT
     { .function = Output_StepperEnableZ, .aux_port = 0xFF, .pin = Z_ENABLE_PIN,   .port = (void *)Z_ENABLE_PORT },
 #endif
+#if defined(Z_ENABLE_PIN) && A_ENABLE_PORT == EXPANDER_PORT
+    { .function = Output_StepperEnableA, .aux_port = 0xFF, .pin = A_ENABLE_PIN,   .port = (void *)A_ENABLE_PORT },
+#endif
+#if defined(B_ENABLE_PIN) && B_ENABLE_PORT == EXPANDER_PORT
+    { .function = Output_StepperEnableB, .aux_port = 0xFF, .pin = B_ENABLE_PIN,   .port = (void *)B_ENABLE_PORT },
+#endif
+#if defined(C_ENABLE_PIN) && C_ENABLE_PORT == EXPANDER_PORT
+    { .function = Output_StepperEnableC, .aux_port = 0xFF, .pin = C_ENABLE_PIN,   .port = (void *)C_ENABLE_PORT },
+#endif
+#if defined(X2_ENABLE_PIN) && X2_ENABLE_PORT == EXPANDER_PORT
+    { .function = Output_StepperEnableX2, .aux_port = 0xFF, .pin = X2_ENABLE_PIN,   .port = (void *)X2_ENABLE_PORT },
+#endif
+#if defined(Y2_ENABLE_PIN) && Y2_ENABLE_PORT == EXPANDER_PORT
+    { .function = Output_StepperEnableY2, .aux_port = 0xFF, .pin = Y2_ENABLE_PIN,   .port = (void *)Y2_ENABLE_PORT },
+#endif
+#if defined(Z2_ENABLE_PIN) && Z2_ENABLE_PORT == EXPANDER_PORT
+    { .function = Output_StepperEnableZ2, .aux_port = 0xFF, .pin = Z2_ENABLE_PIN,   .port = (void *)Z2_ENABLE_PORT },
+#endif
 #endif
 #if AUX_CONTROLS & AUX_CONTROL_SPINDLE
 #ifdef SPINDLE_ENABLE_PIN