diff --git a/src/emsesp.h b/src/emsesp.h
index a7f2ba5ea..37e1b6150 100644
--- a/src/emsesp.h
+++ b/src/emsesp.h
@@ -55,13 +55,19 @@
 
 #define WATCH_ID_NONE 0 // no watch id set
 
-#define EMSESP_JSON_SIZE_HA_CONFIG 768     // for HA config payloads, using StaticJsonDocument
-#define EMSESP_JSON_SIZE_SMALL 256         // for smaller json docs, using StaticJsonDocument
-#define EMSESP_JSON_SIZE_MEDIUM 768        // for medium json docs from ems devices, using StaticJsonDocument
-#define EMSESP_JSON_SIZE_LARGE 1024        // for large json docs from ems devices, like boiler or thermostat data, using StaticJsonDocument
-#define EMSESP_JSON_SIZE_MEDIUM_DYN 1024   // for large json docs, using DynamicJsonDocument
-#define EMSESP_JSON_SIZE_LARGE_DYN 2048    // for very large json docs, using DynamicJsonDocument
-#define EMSESP_JSON_SIZE_XLARGE_DYN 4096   // for very very large json docs, using DynamicJsonDocument
+#define EMSESP_JSON_SIZE_HA_CONFIG 768   // for HA config payloads, using StaticJsonDocument
+#define EMSESP_JSON_SIZE_SMALL 256       // for smaller json docs, using StaticJsonDocument
+#define EMSESP_JSON_SIZE_MEDIUM 768      // for medium json docs from ems devices, using StaticJsonDocument
+#define EMSESP_JSON_SIZE_LARGE 1024      // for large json docs from ems devices, like boiler or thermostat data, using StaticJsonDocument
+#define EMSESP_JSON_SIZE_MEDIUM_DYN 1024 // for large json docs, using DynamicJsonDocument
+#define EMSESP_JSON_SIZE_LARGE_DYN 2048  // for very large json docs, using DynamicJsonDocument
+
+#ifndef EMSESP_STANDALONE
+#define EMSESP_JSON_SIZE_XLARGE_DYN 4096 // for very very large json docs, using DynamicJsonDocument
+#else
+#define EMSESP_JSON_SIZE_XLARGE_DYN 16384 // for very very large json docs, using DynamicJsonDocument
+#endif
+
 #define EMSESP_JSON_SIZE_XXLARGE_DYN 16384 // for extra very very large json docs, using DynamicJsonDocument
 
 // helpers for callback functions
@@ -245,6 +251,7 @@ class EMSESP {
     static void publish_all_loop();
     static bool command_info(uint8_t device_type, JsonObject & json, const int8_t id, bool verbose = true);
     static bool command_commands(uint8_t device_type, JsonObject & json, const int8_t id);
+    static bool command_entities(uint8_t device_type, JsonObject & json, const int8_t id);
 
     static constexpr uint32_t EMS_FETCH_FREQUENCY = 60000; // check every minute
     static uint32_t           last_fetch_;