diff --git a/sonoff/xdrv_interface.ino b/sonoff/xdrv_interface.ino
index a88d3b5f8..c80bb27d4 100644
--- a/sonoff/xdrv_interface.ino
+++ b/sonoff/xdrv_interface.ino
@@ -98,6 +98,54 @@ boolean (* const xdrv_func_ptr[])(byte) PROGMEM = {   // Driver Function Pointer
   &Xdrv20,
 #endif
 
+#ifdef XDRV_21
+  &Xdrv21,
+#endif
+
+#ifdef XDRV_22
+  &Xdrv22,
+#endif
+
+#ifdef XDRV_23
+  &Xdrv23,
+#endif
+
+#ifdef XDRV_24
+  &Xdrv24,
+#endif
+
+#ifdef XDRV_25
+  &Xdrv25,
+#endif
+
+#ifdef XDRV_26
+  &Xdrv26,
+#endif
+
+#ifdef XDRV_27
+  &Xdrv27,
+#endif
+
+#ifdef XDRV_28
+  &Xdrv28,
+#endif
+
+#ifdef XDRV_29
+  &Xdrv29,
+#endif
+
+#ifdef XDRV_30
+  &Xdrv30,
+#endif
+
+#ifdef XDRV_31
+  &Xdrv31,
+#endif
+
+#ifdef XDRV_32
+  &Xdrv32,
+#endif
+
 // Optional user defined drivers in range 91 - 99
 
 #ifdef XDRV_91
diff --git a/sonoff/xnrg_interface.ino b/sonoff/xnrg_interface.ino
index 9af865f26..015d5d284 100644
--- a/sonoff/xnrg_interface.ino
+++ b/sonoff/xnrg_interface.ino
@@ -47,7 +47,39 @@ int (* const xnrg_func_ptr[])(byte) PROGMEM = {   // Energy driver Function Poin
 #endif
 
 #ifdef XNRG_08
-  &Xnrg08
+  &Xnrg08,
+#endif
+
+#ifdef XNRG_09
+  &Xnrg09,
+#endif
+
+#ifdef XNRG_10
+  &Xnrg10,
+#endif
+
+#ifdef XNRG_11
+  &Xnrg11,
+#endif
+
+#ifdef XNRG_12
+  &Xnrg12,
+#endif
+
+#ifdef XNRG_13
+  &Xnrg13,
+#endif
+
+#ifdef XNRG_14
+  &Xnrg14,
+#endif
+
+#ifdef XNRG_15
+  &Xnrg15,
+#endif
+
+#ifdef XNRG_16
+  &Xnrg16
 #endif
 };
 
diff --git a/sonoff/xsns_interface.ino b/sonoff/xsns_interface.ino
index 2f0468b9e..408e68af9 100644
--- a/sonoff/xsns_interface.ino
+++ b/sonoff/xsns_interface.ino
@@ -178,6 +178,46 @@ boolean (* const xsns_func_ptr[])(byte) PROGMEM = {  // Sensor Function Pointers
   &Xsns40,
 #endif
 
+#ifdef XSNS_41
+  &Xsns41,
+#endif
+
+#ifdef XSNS_42
+  &Xsns42,
+#endif
+
+#ifdef XSNS_43
+  &Xsns43,
+#endif
+
+#ifdef XSNS_44
+  &Xsns44,
+#endif
+
+#ifdef XSNS_45
+  &Xsns45,
+#endif
+
+#ifdef XSNS_46
+  &Xsns46,
+#endif
+
+#ifdef XSNS_47
+  &Xsns47,
+#endif
+
+#ifdef XSNS_48
+  &Xsns48,
+#endif
+
+#ifdef XSNS_49
+  &Xsns49,
+#endif
+
+#ifdef XSNS_50
+  &Xsns50,
+#endif
+
 // Optional user defined sensors in range 91 - 99
 
 #ifdef XSNS_91