diff --git a/src/knx/application_program_object.h b/src/knx/application_program_object.h
index 4c691d2..87b743d 100644
--- a/src/knx/application_program_object.h
+++ b/src/knx/application_program_object.h
@@ -3,12 +3,6 @@
 #include "table_object.h"
 #include "bits.h"
 
-enum ParameterFloatEncodings
-{
-    Float_Enc_DPT9 = 0,          // 2 Byte. See Chapter 3.7.2 section 3.10 (Datapoint Types 2-Octet Float Value)
-    Float_Enc_IEEE754Single = 1, // 4 Byte. C++ float
-    Float_Enc_IEEE754Double = 2, // 8 Byte. C++ double
-};
 class ApplicationProgramObject : public TableObject
 {
   public:
diff --git a/src/knx/bits.h b/src/knx/bits.h
index 7f24253..1cd94bf 100644
--- a/src/knx/bits.h
+++ b/src/knx/bits.h
@@ -91,4 +91,11 @@ void sixBytesFromUInt64(uint64_t num, uint8_t* toByteArray);
 uint64_t sixBytesToUInt64(uint8_t* data);
 
 uint16_t crc16Ccitt(uint8_t* input, uint16_t length);
-uint16_t crc16Dnp(uint8_t* input, uint16_t length);
\ No newline at end of file
+uint16_t crc16Dnp(uint8_t* input, uint16_t length);
+
+enum ParameterFloatEncodings
+{
+    Float_Enc_DPT9 = 0,          // 2 Byte. See Chapter 3.7.2 section 3.10 (Datapoint Types 2-Octet Float Value)
+    Float_Enc_IEEE754Single = 1, // 4 Byte. C++ float
+    Float_Enc_IEEE754Double = 2, // 8 Byte. C++ double
+};
\ No newline at end of file
diff --git a/src/knx_facade.cpp b/src/knx_facade.cpp
index 78c8fc8..86ebea9 100644
--- a/src/knx_facade.cpp
+++ b/src/knx_facade.cpp
@@ -15,9 +15,13 @@
     #endif
 
 #elif defined(ARDUINO_ARCH_ESP8266)
-    // predefined global instance for IP only
-    #if MASK_VERSION == 0x57B0
+    // predefined global instance for TP or IP or TP/IP coupler
+    #if MASK_VERSION == 0x07B0
+        KnxFacade<EspPlatform, Bau07B0> knx;
+    #elif MASK_VERSION == 0x57B0
         KnxFacade<EspPlatform, Bau57B0> knx;
+    #elif MASK_VERSION == 0x091A
+        KnxFacade<EspPlatform, Bau091A> knx;
     #else
         #error Mask version not supported on ARDUINO_ARCH_ESP8266
     #endif
diff --git a/src/knx_facade.h b/src/knx_facade.h
index daddc09..0967e66 100644
--- a/src/knx_facade.h
+++ b/src/knx_facade.h
@@ -2,43 +2,32 @@
 
 #include "knx/bits.h"
 #include "knx/config.h"
+#include "knx/bau07B0.h"
+#include "knx/bau091A.h"
+#include "knx/bau27B0.h"
+#include "knx/bau2920.h"
+#include "knx/bau57B0.h"
 
 #ifdef ARDUINO_ARCH_SAMD
     #include "samd_platform.h"
-    #include "knx/bau07B0.h"
-    #include "knx/bau27B0.h"
-    #include "knx/bau2920.h"
     void buttonUp();
 #elif defined(ARDUINO_ARCH_ESP8266)
    #include "esp_platform.h"
-   #include "knx/bau57B0.h"
    void buttonUp();
 #elif defined(ARDUINO_ARCH_ESP32)
    #define LED_BUILTIN 13
    #include "esp32_platform.h"
-   #include "knx/bau07B0.h"
-   #include "knx/bau57B0.h"
-   #include "knx/bau091A.h"
    void buttonUp();
 #elif defined(ARDUINO_ARCH_STM32)
    #include "stm32_platform.h"
-   #include "knx/bau07B0.h"
    void buttonUp();
 #elif __linux__
    #define LED_BUILTIN 0
    #include "linux_platform.h"
-   #include "knx/bau57B0.h"
-   #include "knx/bau27B0.h"
-   #include "knx/bau07B0.h"
-   #include "knx/bau091A.h"
-   #include "knx/bau2920.h"
    void buttonUp();
 #else
    #define LED_BUILTIN 5 // see GPIO_PinConfig gpioPinConfigs[]
    #include "cc1310_platform.h"
-   #include "knx/bau27B0.h"
-   #include "knx/bau07B0.h"
-   #include "knx/bau2920.h"
    extern void buttonUp();
 #endif
 
@@ -352,13 +341,13 @@ template <class P, class B> class KnxFacade : private SaveRestore
         #error "Mask version not supported on ARDUINO_ARCH_SAMD"
     #endif
 #elif defined(ARDUINO_ARCH_ESP8266)
-    // predefined global instance for IP only
-    #if MASK_VERSION == 0x57B0
+    // predefined global instance for TP or IP or TP/IP coupler
+    #if MASK_VERSION == 0x07B0
+        extern KnxFacade<EspPlatform, Bau07B0> knx;
+    #elif MASK_VERSION == 0x57B0
         extern KnxFacade<EspPlatform, Bau57B0> knx;
-    #elif MASK_VERSION == 0x27B0
-        extern KnxFacade<SamdPlatform, Bau27B0> knx;
     #elif MASK_VERSION == 0x091A
-        extern KnxFacade<SamdPlatform, Bau2920> knx;
+        extern KnxFacade<EspPlatform, Bau091A> knx;
     #else
         #error "Mask version not supported on ARDUINO_ARCH_ESP8266"
     #endif