diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index c77273f9f..c85e5572e 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -13,16 +13,27 @@
 - heatpump energy meters [#1463](https://github.com/emsesp/EMS-ESP32/issues/1463)
 - heatpump max power [#1475](https://github.com/emsesp/EMS-ESP32/issues/1475)
 - checkbox for MQTT-TLS enable [#1474](https://github.com/emsesp/EMS-ESP32/issues/1474)
-- added SK (Slovencina) language. Thanks @misa1515
+- added SK (Slovenian) language. Thanks @misa1515
 - CPU info [#1497](https://github.com/emsesp/EMS-ESP32/pull/1497)
+- Show network hostname in Web UI under Network Status
+- Improved HA Discovery so each section (EMS device, Scheduler, Analog, Temperature, Custom, Shower) have their own section
+- boiler Bosch C1200W, id 12, [#1536](https://github.com/emsesp/EMS-ESP32/issues/1536)
+- mixer MM100 telegram 0x2CC [#1554](https://github.com/emsesp/EMS-ESP32/issues/1554)
+- boiler hpSetDiffPressure [#1563](https://github.com/emsesp/EMS-ESP32/issues/1563)
+- custom variables  [#1423](https://github.com/emsesp/EMS-ESP32/issues/1423)
 
 ## Fixed
 
 - exhaust temperature for some boilers
 - add back boil2hyst [#1477](https://github.com/emsesp/EMS-ESP32/issues/1477)
 - subscribed MQTT topics not detecting changes by EMS-ESP [#1494](https://github.com/emsesp/EMS-ESP32/issues/1494)
+- changed HA name and grouping to be consistent [#1528](https://github.com/emsesp/EMS-ESP32/issues/1528)
+- MQTT autodiscovery in Domoticz not working [#1360](https://github.com/emsesp/EMS-ESP32/issues/1528)
+- dhw comfort for new ems+, [#1495](https://github.com/emsesp/EMS-ESP32/issues/1495)
+- added writeable icon to Web's Custom Entity page for each entity shown in the table
 
 ## Changed
 
 - use flag for BC400 compatible thermostats, manage different mode settings
 - HA don't set entity_category to Diagnostic/Configuration for EMS entities [#1459](https://github.com/emsesp/EMS-ESP32/discussions/1459)
+- upgraded ArduinoJson to 7.0.0 #1538 and then 7.0.2
diff --git a/interface/package.json b/interface/package.json
index 15f79bc2c..208151e8d 100644
--- a/interface/package.json
+++ b/interface/package.json
@@ -20,20 +20,20 @@
     "lint": "eslint . --cache --fix"
   },
   "dependencies": {
-    "@alova/adapter-xhr": "^1.0.2",
+    "@alova/adapter-xhr": "^1.0.3",
     "@babel/core": "^7.23.7",
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.15.3",
-    "@mui/material": "^5.15.3",
+    "@mui/icons-material": "^5.15.5",
+    "@mui/material": "^5.15.5",
     "@table-library/react-table-library": "4.1.7",
     "@types/imagemin": "^8.0.5",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^20.10.6",
-    "@types/react": "^18.2.46",
+    "@types/node": "^20.11.5",
+    "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
     "@types/react-router-dom": "^5.3.3",
-    "alova": "^2.16.2",
+    "alova": "^2.17.0",
     "async-validator": "^4.2.5",
     "history": "^5.3.0",
     "jwt-decode": "^4.0.0",
@@ -42,9 +42,9 @@
     "react": "latest",
     "react-dom": "latest",
     "react-dropzone": "^14.2.3",
-    "react-icons": "^4.12.0",
-    "react-router-dom": "^6.21.1",
-    "react-toastify": "^9.1.3",
+    "react-icons": "^5.0.1",
+    "react-router-dom": "^6.21.3",
+    "react-toastify": "^10.0.4",
     "sockette": "^2.0.6",
     "typesafe-i18n": "^5.26.2",
     "typescript": "^5.3.3"
@@ -52,8 +52,8 @@
   "devDependencies": {
     "@preact/compat": "^17.1.2",
     "@preact/preset-vite": "^2.8.1",
-    "@typescript-eslint/eslint-plugin": "^6.17.0",
-    "@typescript-eslint/parser": "^6.17.0",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
     "concurrently": "^8.2.2",
     "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
@@ -67,12 +67,12 @@
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "preact": "^10.19.3",
-    "prettier": "^3.1.1",
+    "prettier": "^3.2.4",
     "rollup-plugin-visualizer": "^5.12.0",
-    "terser": "^5.26.0",
-    "vite": "^5.0.10",
+    "terser": "^5.27.0",
+    "vite": "^5.0.12",
     "vite-plugin-imagemin": "^0.6.1",
-    "vite-tsconfig-paths": "^4.2.3"
+    "vite-tsconfig-paths": "^4.3.1"
   },
   "packageManager": "yarn@4.0.2"
 }
diff --git a/interface/progmem-generator.js b/interface/progmem-generator.js
index 98d74f5f4..e68e047b6 100644
--- a/interface/progmem-generator.js
+++ b/interface/progmem-generator.js
@@ -12,6 +12,7 @@ var totalSize = 0;
 
 const generateWWWClass = () =>
   `typedef std::function<void(const String& uri, const String& contentType, const uint8_t * content, size_t len)> RouteRegistrationHandler;
+// Total size is ${totalSize} bytes
 
 class WWWData {
 ${indent}public:
diff --git a/interface/src/components/upload/SingleUpload.tsx b/interface/src/components/upload/SingleUpload.tsx
index 498e4b913..bbd3e9ce3 100644
--- a/interface/src/components/upload/SingleUpload.tsx
+++ b/interface/src/components/upload/SingleUpload.tsx
@@ -50,8 +50,10 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, pr
 
   const progressText = () => {
     if (uploading) {
-      if (progress.total) {
-        return LL.UPLOADING() + ': ' + Math.round((progress.loaded * 100) / progress.total) + '%';
+      if (progress.total && progress.loaded) {
+        return progress.loaded <= progress.total
+          ? LL.UPLOADING() + ': ' + Math.round((progress.loaded * 100) / progress.total) + '%'
+          : LL.UPLOADING() + ': ' + Math.round((progress.total * 100) / progress.loaded) + '%';
       }
     }
     return LL.UPLOAD_DROP_TEXT();
@@ -83,7 +85,13 @@ const SingleUpload: FC<SingleUploadProps> = ({ onDrop, onCancel, isUploading, pr
             <Box width="100%" p={2}>
               <LinearProgress
                 variant="determinate"
-                value={progress.total === 0 ? 0 : Math.round((progress.loaded * 100) / progress.total)}
+                value={
+                  progress.total === 0 || progress.loaded === 0
+                    ? 0
+                    : progress.loaded <= progress.total
+                      ? Math.round((progress.loaded * 100) / progress.total)
+                      : Math.round((progress.total * 100) / progress.loaded)
+                }
               />
             </Box>
             <Button startIcon={<CancelIcon />} variant="outlined" color="secondary" onClick={onCancel}>
diff --git a/interface/src/framework/mqtt/MqttSettingsForm.tsx b/interface/src/framework/mqtt/MqttSettingsForm.tsx
index 059a8c501..f8a7f0a26 100644
--- a/interface/src/framework/mqtt/MqttSettingsForm.tsx
+++ b/interface/src/framework/mqtt/MqttSettingsForm.tsx
@@ -273,6 +273,7 @@ const MqttSettingsForm: FC = () => {
                   >
                     <MenuItem value={0}>Home Assistant</MenuItem>
                     <MenuItem value={1}>Domoticz</MenuItem>
+                    <MenuItem value={2}>Domoticz (latest)</MenuItem>
                   </TextField>
                 </Grid>
                 <Grid item xs={12} sm={6} md={4}>
diff --git a/interface/src/framework/network/NetworkStatusForm.tsx b/interface/src/framework/network/NetworkStatusForm.tsx
index 9d94d2490..3a731c4ca 100644
--- a/interface/src/framework/network/NetworkStatusForm.tsx
+++ b/interface/src/framework/network/NetworkStatusForm.tsx
@@ -1,5 +1,6 @@
 import DeviceHubIcon from '@mui/icons-material/DeviceHub';
 import DnsIcon from '@mui/icons-material/Dns';
+import GiteIcon from '@mui/icons-material/Gite';
 import RefreshIcon from '@mui/icons-material/Refresh';
 import RouterIcon from '@mui/icons-material/Router';
 import SettingsInputAntennaIcon from '@mui/icons-material/SettingsInputAntenna';
@@ -115,6 +116,15 @@ const NetworkStatusForm: FC = () => {
             <ListItemText primary="Status" secondary={networkStatus(data)} />
           </ListItem>
           <Divider variant="inset" component="li" />
+          <ListItem>
+            <ListItemAvatar>
+              <Avatar sx={{ bgcolor: networkStatusHighlight(data, theme) }}>
+                <GiteIcon />
+              </Avatar>
+            </ListItemAvatar>
+            <ListItemText primary="Hostname" secondary={data.hostname} />
+          </ListItem>
+          <Divider variant="inset" component="li" />
           {isWiFi(data) && (
             <>
               <ListItem>
diff --git a/interface/src/framework/security/GenerateToken.tsx b/interface/src/framework/security/GenerateToken.tsx
index f7092829f..e8b45bc93 100644
--- a/interface/src/framework/security/GenerateToken.tsx
+++ b/interface/src/framework/security/GenerateToken.tsx
@@ -37,7 +37,8 @@ const GenerateToken: FC<GenerateTokenProps> = ({ username, onClose }) => {
     if (open) {
       void generateToken();
     }
-  }, [open, generateToken]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [open]);
 
   return (
     <Dialog sx={dialogStyle} onClose={onClose} open={!!username} fullWidth maxWidth="sm">
diff --git a/interface/src/framework/system/SystemStatusForm.tsx b/interface/src/framework/system/SystemStatusForm.tsx
index 3da021afe..940b4339d 100644
--- a/interface/src/framework/system/SystemStatusForm.tsx
+++ b/interface/src/framework/system/SystemStatusForm.tsx
@@ -227,6 +227,8 @@ const SystemStatusForm: FC = () => {
             <ListItemText
               primary="CPU"
               secondary={
+                data.esp_platform +
+                '/' +
                 data.cpu_type +
                 ' (rev.' +
                 data.cpu_rev +
diff --git a/interface/src/framework/system/UploadFileForm.tsx b/interface/src/framework/system/UploadFileForm.tsx
index c33019df3..e0df328ed 100644
--- a/interface/src/framework/system/UploadFileForm.tsx
+++ b/interface/src/framework/system/UploadFileForm.tsx
@@ -136,6 +136,7 @@ const UploadFileForm: FC = () => {
         <Typography variant="body2">
           {LL.UPLOAD_TEXT()}
           <br />
+          <br />
           {LL.RESTART_TEXT(1)}.
         </Typography>
       </Box>
diff --git a/interface/src/i18n/en/index.ts b/interface/src/i18n/en/index.ts
index db5c85803..d2978b1f3 100644
--- a/interface/src/i18n/en/index.ts
+++ b/interface/src/i18n/en/index.ts
@@ -63,7 +63,7 @@ const en: Translation = {
   FREQ: 'Frequency',
   DUTY_CYCLE: 'Duty Cycle',
   UNIT: 'UoM',
-  STARTVALUE: 'Start value',
+  STARTVALUE: 'Start Value',
   WARN_GPIO: 'Warning: be careful when assigning a GPIO!',
   EDIT: 'Edit',
   SENSOR: 'Sensor',
diff --git a/interface/src/project/DashboardDevices.tsx b/interface/src/project/DashboardDevices.tsx
index abbb07b18..f59047e3f 100644
--- a/interface/src/project/DashboardDevices.tsx
+++ b/interface/src/project/DashboardDevices.tsx
@@ -420,7 +420,7 @@ const DashboardDevices: FC = () => {
         <MessageBox my={2} level="warning" message={LL.EMS_BUS_SCANNING()} />
       )}
 
-      {coreData.connected && (
+      {coreData.devices.length !== 0 && (
         <Table data={{ nodes: coreData.devices }} select={device_select} theme={device_theme} layout={{ custom: true }}>
           {(tableList: any) => (
             <>
diff --git a/interface/src/project/DashboardDevicesDialog.tsx b/interface/src/project/DashboardDevicesDialog.tsx
index 7fe962371..aab6fa30d 100644
--- a/interface/src/project/DashboardDevicesDialog.tsx
+++ b/interface/src/project/DashboardDevicesDialog.tsx
@@ -103,7 +103,7 @@ const DashboardDevicesDialog = ({
   return (
     <Dialog sx={dialogStyle} open={open} onClose={close}>
       <DialogTitle>
-        {selectedItem.v === '' && selectedItem.c ? LL.RUN_COMMAND() : writeable ? LL.CHANGE_VALUE() : LL.VALUE(0)}
+        {selectedItem.v === '' && selectedItem.c ? LL.RUN_COMMAND() : writeable ? LL.CHANGE_VALUE() : LL.VALUE(1)}
       </DialogTitle>
       <DialogContent dividers>
         <Box color="warning.main" p={0} pl={0} pr={0} mt={0} mb={2}>
diff --git a/interface/src/project/DashboardSensors.tsx b/interface/src/project/DashboardSensors.tsx
index 9fde6feae..ea2bfdb90 100644
--- a/interface/src/project/DashboardSensors.tsx
+++ b/interface/src/project/DashboardSensors.tsx
@@ -262,7 +262,7 @@ const DashboardSensors: FC = () => {
     setSelectedAnalogSensor({
       id: Math.floor(Math.random() * (Math.floor(200) - 100) + 100),
       n: '',
-      g: 40,
+      g: 21, // default GPIO 21 which is safe for all platforms
       u: 0,
       v: 0,
       o: 0,
diff --git a/interface/src/project/DashboardSensorsAnalogDialog.tsx b/interface/src/project/DashboardSensorsAnalogDialog.tsx
index f66f700a3..7e6d82463 100644
--- a/interface/src/project/DashboardSensorsAnalogDialog.tsx
+++ b/interface/src/project/DashboardSensorsAnalogDialog.tsx
@@ -182,7 +182,7 @@ const DashboardSensorsAnalogDialog = ({
             <Grid item xs={4}>
               <TextField
                 name="o"
-                label={LL.VALUE(0)}
+                label={LL.VALUE(1)}
                 value={numberValue(editItem.o)}
                 fullWidth
                 type="number"
@@ -197,7 +197,7 @@ const DashboardSensorsAnalogDialog = ({
               <Grid item xs={4}>
                 <TextField
                   name="o"
-                  label={LL.VALUE(0)}
+                  label={LL.VALUE(1)}
                   value={numberValue(editItem.o)}
                   fullWidth
                   select
diff --git a/interface/src/project/Settings.tsx b/interface/src/project/Settings.tsx
index 5a0de5b82..442c9a8f5 100644
--- a/interface/src/project/Settings.tsx
+++ b/interface/src/project/Settings.tsx
@@ -2,8 +2,8 @@ import { Tab } from '@mui/material';
 import { Navigate, Route, Routes } from 'react-router-dom';
 
 import SettingsApplication from './SettingsApplication';
+import SettingsCustomEntities from './SettingsCustomEntities';
 import SettingsCustomization from './SettingsCustomization';
-import SettingsEntities from './SettingsEntities';
 import SettingsScheduler from './SettingsScheduler';
 import type { FC } from 'react';
 import { RouterTabs, useRouterTab, useLayoutTitle } from 'components';
@@ -27,7 +27,7 @@ const Settings: FC = () => {
         <Route path="application" element={<SettingsApplication />} />
         <Route path="customization" element={<SettingsCustomization />} />
         <Route path="scheduler" element={<SettingsScheduler />} />
-        <Route path="customentities" element={<SettingsEntities />} />
+        <Route path="customentities" element={<SettingsCustomEntities />} />
         <Route path="*" element={<Navigate replace to="/settings/application" />} />
       </Routes>
     </>
diff --git a/interface/src/project/SettingsEntities.tsx b/interface/src/project/SettingsCustomEntities.tsx
similarity index 84%
rename from interface/src/project/SettingsEntities.tsx
rename to interface/src/project/SettingsCustomEntities.tsx
index 708d86513..dfda883f0 100644
--- a/interface/src/project/SettingsEntities.tsx
+++ b/interface/src/project/SettingsCustomEntities.tsx
@@ -1,5 +1,7 @@
 import AddIcon from '@mui/icons-material/Add';
 import CancelIcon from '@mui/icons-material/Cancel';
+import RefreshIcon from '@mui/icons-material/Refresh';
+import EditOutlinedIcon from '@mui/icons-material/EditOutlined';
 import WarningIcon from '@mui/icons-material/Warning';
 import { Button, Typography, Box } from '@mui/material';
 import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-library/react-table-library/table';
@@ -11,7 +13,7 @@ import { useBlocker } from 'react-router-dom';
 
 import { toast } from 'react-toastify';
 
-import SettingsEntitiesDialog from './SettingsEntitiesDialog';
+import SettingsCustomEntitiesDialog from './SettingsCustomEntitiesDialog';
 import * as EMSESP from './api';
 import { DeviceValueTypeNames, DeviceValueUOM_s } from './types';
 import { entityItemValidation } from './validators';
@@ -21,7 +23,7 @@ import { ButtonRow, FormLoader, SectionContent, BlockNavigation } from 'componen
 
 import { useI18nContext } from 'i18n/i18n-react';
 
-const SettingsEntities: FC = () => {
+const SettingsCustomEntities: FC = () => {
   const { LL } = useI18nContext();
   const [numChanges, setNumChanges] = useState<number>(0);
   const blocker = useBlocker(numChanges !== 0);
@@ -43,6 +45,7 @@ const SettingsEntities: FC = () => {
   function hasEntityChanged(ei: EntityItem) {
     return (
       ei.id !== ei.o_id ||
+      ei.ram !== ei.o_ram ||
       (ei?.name || '') !== (ei?.o_name || '') ||
       ei.device_id !== ei.o_device_id ||
       ei.type_id !== ei.o_type_id ||
@@ -51,7 +54,8 @@ const SettingsEntities: FC = () => {
       ei.factor !== ei.o_factor ||
       ei.value_type !== ei.o_value_type ||
       ei.writeable !== ei.o_writeable ||
-      ei.deleted !== ei.o_deleted
+      ei.deleted !== ei.o_deleted ||
+      (ei.value || '') !== (ei.o_value || '')
     );
   }
 
@@ -118,6 +122,7 @@ const SettingsEntities: FC = () => {
         .filter((ei) => !ei.deleted)
         .map((condensed_ei) => ({
           id: condensed_ei.id,
+          ram: condensed_ei.ram,
           name: condensed_ei.name,
           device_id: condensed_ei.device_id,
           type_id: condensed_ei.type_id,
@@ -125,7 +130,8 @@ const SettingsEntities: FC = () => {
           factor: condensed_ei.factor,
           uom: condensed_ei.uom,
           writeable: condensed_ei.writeable,
-          value_type: condensed_ei.value_type
+          value_type: condensed_ei.value_type,
+          value: condensed_ei.value
         }))
     })
       .then(() => {
@@ -173,14 +179,16 @@ const SettingsEntities: FC = () => {
     setSelectedEntityItem({
       id: Math.floor(Math.random() * (Math.floor(200) - 100) + 100),
       name: '',
-      device_id: '',
-      type_id: '',
+      ram: 0,
+      device_id: '0',
+      type_id: '0',
       offset: 0,
       factor: 1,
       uom: 0,
       value_type: 0,
       writeable: false,
-      deleted: false
+      deleted: false,
+      value: ''
     });
     setDialogOpen(true);
   };
@@ -212,18 +220,21 @@ const SettingsEntities: FC = () => {
                 <HeaderCell stiff>{LL.ID_OF(LL.DEVICE())}</HeaderCell>
                 <HeaderCell stiff>{LL.ID_OF(LL.TYPE(1))}</HeaderCell>
                 <HeaderCell stiff>{LL.OFFSET()}</HeaderCell>
-                <HeaderCell stiff>{LL.VALUE(1) + ' ' + LL.TYPE(1)}</HeaderCell>
+                <HeaderCell stiff>{LL.TYPE(1)}</HeaderCell>
                 <HeaderCell stiff>{LL.VALUE(1)}</HeaderCell>
               </HeaderRow>
             </Header>
             <Body>
               {tableList.map((ei: EntityItem) => (
                 <Row key={ei.name} item={ei} onClick={() => editEntityItem(ei)}>
-                  <Cell>{ei.name}</Cell>
-                  <Cell>{showHex(ei.device_id as number, 2)}</Cell>
-                  <Cell>{showHex(ei.type_id as number, 3)}</Cell>
-                  <Cell>{ei.offset}</Cell>
-                  <Cell>{DeviceValueTypeNames[ei.value_type]}</Cell>
+                  <Cell>
+                    {ei.name}&nbsp;
+                    {ei.writeable && <EditOutlinedIcon color="primary" sx={{ fontSize: 12 }} />}
+                  </Cell>
+                  <Cell>{ei.ram === 1 ? '' : showHex(ei.device_id as number, 2)}</Cell>
+                  <Cell>{ei.ram === 1 ? '' : showHex(ei.type_id as number, 3)}</Cell>
+                  <Cell>{ei.ram === 1 ? '' : ei.offset}</Cell>
+                  <Cell>{ei.ram === 1 ? 'RAM' : DeviceValueTypeNames[ei.value_type]}</Cell>
                   <Cell>{formatValue(ei.value, ei.uom)}</Cell>
                 </Row>
               ))}
@@ -244,7 +255,7 @@ const SettingsEntities: FC = () => {
       {renderEntity()}
 
       {selectedEntityItem && (
-        <SettingsEntitiesDialog
+        <SettingsCustomEntitiesDialog
           open={dialogOpen}
           creating={creating}
           onClose={onDialogClose}
@@ -274,7 +285,10 @@ const SettingsEntities: FC = () => {
         </Box>
         <Box flexWrap="nowrap" whiteSpace="nowrap">
           <ButtonRow>
-            <Button startIcon={<AddIcon />} variant="outlined" color="secondary" onClick={addEntityItem}>
+            <Button startIcon={<RefreshIcon />} variant="outlined" color="secondary" onClick={fetchEntities}>
+              {LL.REFRESH()}
+            </Button>
+            <Button startIcon={<AddIcon />} variant="outlined" color="primary" onClick={addEntityItem}>
               {LL.ADD(0)}
             </Button>
           </ButtonRow>
@@ -284,4 +298,4 @@ const SettingsEntities: FC = () => {
   );
 };
 
-export default SettingsEntities;
+export default SettingsCustomEntities;
diff --git a/interface/src/project/SettingsEntitiesDialog.tsx b/interface/src/project/SettingsCustomEntitiesDialog.tsx
similarity index 50%
rename from interface/src/project/SettingsEntitiesDialog.tsx
rename to interface/src/project/SettingsCustomEntitiesDialog.tsx
index 061eab8c5..691f23b25 100644
--- a/interface/src/project/SettingsEntitiesDialog.tsx
+++ b/interface/src/project/SettingsCustomEntitiesDialog.tsx
@@ -30,7 +30,7 @@ import { useI18nContext } from 'i18n/i18n-react';
 import { updateValue } from 'utils';
 import { validate } from 'validators';
 
-type SettingsEntitiesDialogProps = {
+type SettingsCustomEntitiesDialogProps = {
   open: boolean;
   creating: boolean;
   onClose: () => void;
@@ -39,14 +39,14 @@ type SettingsEntitiesDialogProps = {
   validator: Schema;
 };
 
-const SettingsEntitiesDialog = ({
+const SettingsCustomEntitiesDialog = ({
   open,
   creating,
   onClose,
   onSave,
   selectedItem,
   validator
-}: SettingsEntitiesDialogProps) => {
+}: SettingsCustomEntitiesDialogProps) => {
   const { LL } = useI18nContext();
   const [editItem, setEditItem] = useState<EntityItem>(selectedItem);
   const [fieldErrors, setFieldErrors] = useState<ValidateFieldsError>();
@@ -100,7 +100,7 @@ const SettingsEntitiesDialog = ({
           <Box flexWrap="nowrap" whiteSpace="nowrap" />
         </Box>
         <Grid container spacing={2}>
-          <Grid item xs={8}>
+          <Grid item xs={4}>
             <ValidatedTextField
               fieldErrors={fieldErrors}
               name="name"
@@ -111,122 +111,154 @@ const SettingsEntitiesDialog = ({
               onChange={updateFormValue}
             />
           </Grid>
-          <Grid item xs={4} mt={3}>
-            <BlockFormControlLabel
-              control={<Checkbox checked={editItem.writeable} onChange={updateFormValue} name="writeable" />}
-              label={LL.WRITEABLE()}
-            />
-          </Grid>
-          <Grid item xs={4}>
-            <ValidatedTextField
-              fieldErrors={fieldErrors}
-              name="device_id"
-              label={LL.ID_OF(LL.DEVICE())}
-              margin="normal"
-              type="string"
-              fullWidth
-              value={editItem.device_id as string}
-              onChange={updateFormValue}
-              inputProps={{ style: { textTransform: 'uppercase' } }}
-              InputProps={{ startAdornment: <InputAdornment position="start">0x</InputAdornment> }}
-            />
-          </Grid>
-          <Grid item xs={4}>
-            <ValidatedTextField
-              fieldErrors={fieldErrors}
-              name="type_id"
-              label={LL.ID_OF(LL.TYPE(1))}
-              margin="normal"
-              fullWidth
-              value={editItem.type_id}
-              onChange={updateFormValue}
-              inputProps={{ style: { textTransform: 'uppercase' } }}
-              InputProps={{ startAdornment: <InputAdornment position="start">0x</InputAdornment> }}
-            />
-          </Grid>
-          <Grid item xs={4}>
-            <ValidatedTextField
-              fieldErrors={fieldErrors}
-              name="offset"
-              label={LL.OFFSET()}
-              margin="normal"
-              fullWidth
-              type="number"
-              value={editItem.offset}
-              onChange={updateFormValue}
-            />
-          </Grid>
           <Grid item xs={4}>
             <TextField
-              name="value_type"
+              name="ram"
               label={LL.VALUE(1) + ' ' + LL.TYPE(1)}
-              value={editItem.value_type}
+              value={editItem.ram}
               variant="outlined"
               onChange={updateFormValue}
               margin="normal"
               fullWidth
               select
             >
-              <MenuItem value={DeviceValueType.BOOL}>BOOL</MenuItem>
-              <MenuItem value={DeviceValueType.INT}>INT</MenuItem>
-              <MenuItem value={DeviceValueType.UINT}>UINT</MenuItem>
-              <MenuItem value={DeviceValueType.SHORT}>SHORT</MenuItem>
-              <MenuItem value={DeviceValueType.USHORT}>USHORT</MenuItem>
-              <MenuItem value={DeviceValueType.ULONG}>ULONG</MenuItem>
-              <MenuItem value={DeviceValueType.TIME}>TIME</MenuItem>
-              <MenuItem value={DeviceValueType.STRING}>RAW</MenuItem>
+              <MenuItem value={0}>EMS-{LL.VALUE(1)}</MenuItem>
+              <MenuItem value={1}>RAM-{LL.VALUE(1)}</MenuItem>
             </TextField>
           </Grid>
-
-          {editItem.value_type !== DeviceValueType.BOOL && editItem.value_type !== DeviceValueType.STRING && (
-            <>
-              <Grid item xs={4}>
-                <TextField
-                  name="factor"
-                  label={LL.FACTOR()}
-                  value={editItem.factor}
-                  variant="outlined"
-                  onChange={updateFormValue}
-                  fullWidth
-                  margin="normal"
-                  type="number"
-                  inputProps={{ step: '0.001' }}
-                />
-              </Grid>
-              <Grid item xs={4}>
-                <TextField
-                  name="uom"
-                  label={LL.UNIT()}
-                  value={editItem.uom}
-                  margin="normal"
-                  fullWidth
-                  onChange={updateFormValue}
-                  select
-                >
-                  {DeviceValueUOM_s.map((val, i) => (
-                    <MenuItem key={i} value={i}>
-                      {val}
-                    </MenuItem>
-                  ))}
-                </TextField>
-              </Grid>
-            </>
-          )}
-          {editItem.value_type === DeviceValueType.STRING && (
+          {editItem.ram === 1 && (
             <Grid item xs={4}>
               <TextField
-                name="factor"
-                label="Bytes"
-                value={editItem.factor}
+                name="value"
+                label={LL.STARTVALUE()}
+                value={editItem.value}
                 variant="outlined"
                 onChange={updateFormValue}
                 fullWidth
                 margin="normal"
-                type="number"
-                inputProps={{ min: '1', max: '27', step: '1' }}
               />
             </Grid>
           )}
+          {editItem.ram === 0 && (
+            <>
+              <Grid item xs={4} mt={3}>
+                <BlockFormControlLabel
+                  control={<Checkbox checked={editItem.writeable} onChange={updateFormValue} name="writeable" />}
+                  label={LL.WRITEABLE()}
+                />
+              </Grid>
+              <Grid item xs={4}>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors}
+                  name="device_id"
+                  label={LL.ID_OF(LL.DEVICE())}
+                  margin="normal"
+                  type="string"
+                  fullWidth
+                  value={editItem.device_id as string}
+                  onChange={updateFormValue}
+                  inputProps={{ style: { textTransform: 'uppercase' } }}
+                  InputProps={{ startAdornment: <InputAdornment position="start">0x</InputAdornment> }}
+                />
+              </Grid>
+              <Grid item xs={4}>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors}
+                  name="type_id"
+                  label={LL.ID_OF(LL.TYPE(1))}
+                  margin="normal"
+                  fullWidth
+                  value={editItem.type_id}
+                  onChange={updateFormValue}
+                  inputProps={{ style: { textTransform: 'uppercase' } }}
+                  InputProps={{ startAdornment: <InputAdornment position="start">0x</InputAdornment> }}
+                />
+              </Grid>
+              <Grid item xs={4}>
+                <ValidatedTextField
+                  fieldErrors={fieldErrors}
+                  name="offset"
+                  label={LL.OFFSET()}
+                  margin="normal"
+                  fullWidth
+                  type="number"
+                  value={editItem.offset}
+                  onChange={updateFormValue}
+                />
+              </Grid>
+              <Grid item xs={4}>
+                <TextField
+                  name="value_type"
+                  label={LL.VALUE(1) + ' ' + LL.TYPE(1)}
+                  value={editItem.value_type}
+                  variant="outlined"
+                  onChange={updateFormValue}
+                  margin="normal"
+                  fullWidth
+                  select
+                >
+                  <MenuItem value={DeviceValueType.BOOL}>BOOL</MenuItem>
+                  <MenuItem value={DeviceValueType.INT}>INT</MenuItem>
+                  <MenuItem value={DeviceValueType.UINT}>UINT</MenuItem>
+                  <MenuItem value={DeviceValueType.SHORT}>SHORT</MenuItem>
+                  <MenuItem value={DeviceValueType.USHORT}>USHORT</MenuItem>
+                  <MenuItem value={DeviceValueType.ULONG}>ULONG</MenuItem>
+                  <MenuItem value={DeviceValueType.TIME}>TIME</MenuItem>
+                  <MenuItem value={DeviceValueType.STRING}>RAW</MenuItem>
+                </TextField>
+              </Grid>
+
+              {editItem.value_type !== DeviceValueType.BOOL && editItem.value_type !== DeviceValueType.STRING && (
+                <>
+                  <Grid item xs={4}>
+                    <TextField
+                      name="factor"
+                      label={LL.FACTOR()}
+                      value={editItem.factor}
+                      variant="outlined"
+                      onChange={updateFormValue}
+                      fullWidth
+                      margin="normal"
+                      type="number"
+                      inputProps={{ step: '0.001' }}
+                    />
+                  </Grid>
+                  <Grid item xs={4}>
+                    <TextField
+                      name="uom"
+                      label={LL.UNIT()}
+                      value={editItem.uom}
+                      margin="normal"
+                      fullWidth
+                      onChange={updateFormValue}
+                      select
+                    >
+                      {DeviceValueUOM_s.map((val, i) => (
+                        <MenuItem key={i} value={i}>
+                          {val}
+                        </MenuItem>
+                      ))}
+                    </TextField>
+                  </Grid>
+                </>
+              )}
+              {editItem.value_type === DeviceValueType.STRING && editItem.device_id !== '0' && (
+                <Grid item xs={4}>
+                  <TextField
+                    name="factor"
+                    label="Bytes"
+                    value={editItem.factor}
+                    variant="outlined"
+                    onChange={updateFormValue}
+                    fullWidth
+                    margin="normal"
+                    type="number"
+                    inputProps={{ min: '1', max: '27', step: '1' }}
+                  />
+                </Grid>
+              )}
+            </>
+          )}
         </Grid>
       </DialogContent>
 
@@ -249,4 +281,4 @@ const SettingsEntitiesDialog = ({
   );
 };
 
-export default SettingsEntitiesDialog;
+export default SettingsCustomEntitiesDialog;
diff --git a/interface/src/project/SettingsSchedulerDialog.tsx b/interface/src/project/SettingsSchedulerDialog.tsx
index d038f8c40..111625da1 100644
--- a/interface/src/project/SettingsSchedulerDialog.tsx
+++ b/interface/src/project/SettingsSchedulerDialog.tsx
@@ -210,7 +210,7 @@ const SettingsSchedulerDialog = ({
         />
         <TextField
           name="value"
-          label={LL.VALUE(0)}
+          label={LL.VALUE(1)}
           multiline
           margin="normal"
           fullWidth
diff --git a/interface/src/project/api.ts b/interface/src/project/api.ts
index 98d65f92f..96b317203 100644
--- a/interface/src/project/api.ts
+++ b/interface/src/project/api.ts
@@ -20,7 +20,7 @@ export const readCoreData = () => alovaInstance.Get<CoreData>(`/rest/coreData`);
 export const readDeviceData = (id: number) =>
   alovaInstance.Get<DeviceData>('/rest/deviceData', {
     // alovaInstance.Get<DeviceData>(`/rest/deviceData/${id}`, {
-    params: { id }, // TODO remove later
+    params: { id }, // TODO replace later
     responseType: 'arraybuffer' // uses msgpack
   });
 export const writeDeviceValue = (data: any) => alovaInstance.Post('/rest/writeDeviceValue', data);
@@ -56,7 +56,7 @@ export const getSchedule = () => alovaInstance.Get('/rest/getSchedule');
 export const readDeviceEntities = (id: number) =>
   // alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities/${id}`, {
   alovaInstance.Get<DeviceEntity[]>(`/rest/deviceEntities`, {
-    params: { id }, // TODO remove later
+    params: { id }, // TODO replace later
     responseType: 'arraybuffer',
     transformData(data: any) {
       return data.map((de: DeviceEntity) => ({ ...de, o_m: de.m, o_cn: de.cn, o_mi: de.mi, o_ma: de.ma }));
@@ -88,7 +88,7 @@ export const writeSchedule = (data: any) => alovaInstance.Post('/rest/schedule',
 
 // SettingsEntities
 export const readCustomEntities = () =>
-  alovaInstance.Get<EntityItem[]>('/rest/customentities', {
+  alovaInstance.Get<EntityItem[]>('/rest/customEntities', {
     name: 'entities',
     transformData(data: any) {
       return data.entities.map((ei: EntityItem) => ({
@@ -106,4 +106,4 @@ export const readCustomEntities = () =>
       }));
     }
   });
-export const writeCustomEntities = (data: any) => alovaInstance.Post('/rest/customentities', data);
+export const writeCustomEntities = (data: any) => alovaInstance.Post('/rest/customEntities', data);
diff --git a/interface/src/project/types.ts b/interface/src/project/types.ts
index 10ea8cd7c..e2943a246 100644
--- a/interface/src/project/types.ts
+++ b/interface/src/project/types.ts
@@ -177,7 +177,8 @@ export enum DeviceValueUOM {
   L,
   KMIN,
   K,
-  VOLTS
+  VOLTS,
+  MBAR
 }
 
 export const DeviceValueUOM_s = [
@@ -204,7 +205,8 @@ export const DeviceValueUOM_s = [
   'l',
   'K*min',
   'K',
-  'V'
+  'V',
+  'mbar'
 ];
 
 export enum AnalogType {
@@ -223,12 +225,12 @@ export enum AnalogType {
 
 export const AnalogTypeNames = [
   '(disabled)',
-  'Digital in',
+  'Digital In',
   'Counter',
   'ADC',
   'Timer',
   'Rate',
-  'Digital out',
+  'Digital Out',
   'PWM 0',
   'PWM 1',
   'PWM 2'
@@ -323,6 +325,7 @@ export enum ScheduleFlag {
 
 export interface EntityItem {
   id: number; // unique number
+  ram: number;
   name: string;
   device_id: number | string;
   type_id: number | string;
@@ -334,6 +337,7 @@ export interface EntityItem {
   writeable: boolean;
   deleted?: boolean;
   o_id?: number;
+  o_ram?: number;
   o_name?: string;
   o_device_id?: number | string;
   o_type_id?: number | string;
@@ -343,6 +347,7 @@ export interface EntityItem {
   o_value_type?: number;
   o_deleted?: boolean;
   o_writeable?: boolean;
+  o_value?: any;
 }
 
 export interface Entities {
@@ -398,6 +403,6 @@ export const DeviceValueTypeNames = [
   'ULONG',
   'TIME',
   'ENUM',
-  'STRING',
+  'RAW',
   'CMD'
 ];
diff --git a/interface/src/types/network.ts b/interface/src/types/network.ts
index 70df69b1c..8740eb9b4 100644
--- a/interface/src/types/network.ts
+++ b/interface/src/types/network.ts
@@ -33,6 +33,7 @@ export interface NetworkStatus {
   gateway_ip: string;
   dns_ip_1: string;
   dns_ip_2: string;
+  hostname: string;
 }
 
 export interface NetworkSettings {
diff --git a/interface/src/types/ntp.ts b/interface/src/types/ntp.ts
index e22a9fa59..b783cfb80 100644
--- a/interface/src/types/ntp.ts
+++ b/interface/src/types/ntp.ts
@@ -9,7 +9,6 @@ export interface NTPStatus {
   utc_time: string;
   local_time: string;
   server: string;
-  uptime: number;
 }
 
 export interface NTPSettings {
diff --git a/interface/src/utils/useWs.ts b/interface/src/utils/useWs.ts
deleted file mode 100644
index 3471c691e..000000000
--- a/interface/src/utils/useWs.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import { debounce } from 'lodash-es';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import Sockette from 'sockette';
-
-import { addAccessTokenParameter } from 'api/authentication';
-
-interface WebSocketIdMessage {
-  type: 'id';
-  id: string;
-}
-
-interface WebSocketPayloadMessage<D> {
-  type: 'payload';
-  origin_id: string;
-  payload: D;
-}
-
-export type WebSocketMessage<D> = WebSocketIdMessage | WebSocketPayloadMessage<D>;
-
-export const useWs = <D>(wsUrl: string, wsThrottle = 100) => {
-  const ws = useRef<Sockette>();
-  const clientId = useRef<string>();
-
-  const [connected, setConnected] = useState<boolean>(false);
-  const [data, setData] = useState<D>();
-  const [transmit, setTransmit] = useState<boolean>();
-  const [clear, setClear] = useState<boolean>();
-
-  const onMessage = useCallback((event: MessageEvent) => {
-    const rawData = event.data;
-    if (typeof rawData === 'string' || rawData instanceof String) {
-      const message = JSON.parse(rawData as string) as WebSocketMessage<D>;
-      switch (message.type) {
-        case 'id':
-          clientId.current = message.id;
-          break;
-        case 'payload':
-          if (clientId.current) {
-            setData((existingData) => (clientId.current === message.origin_id && existingData) || message.payload);
-          }
-          break;
-      }
-    }
-  }, []);
-
-  const doSaveData = useCallback((newData: D, clearData = false) => {
-    if (!ws.current) {
-      return;
-    }
-    if (clearData) {
-      setData(undefined);
-    }
-    ws.current.json(newData);
-  }, []);
-
-  const saveData = useRef(debounce(doSaveData, wsThrottle));
-
-  const updateData = (newData: React.SetStateAction<D | undefined>, transmitData: true, clearData: false) => {
-    setData(newData);
-    setTransmit(transmitData);
-    setClear(clearData);
-  };
-
-  useEffect(() => {
-    if (!transmit) {
-      return;
-    }
-    data && saveData.current(data, clear);
-    setTransmit(false);
-    setClear(false);
-  }, [doSaveData, data, transmit, clear]);
-
-  useEffect(() => {
-    const instance = new Sockette(addAccessTokenParameter(wsUrl), {
-      onmessage: onMessage,
-      onopen: () => {
-        setConnected(true);
-      },
-      onclose: () => {
-        clientId.current = undefined;
-        setConnected(false);
-        setData(undefined);
-      }
-    });
-    ws.current = instance;
-    // eslint-disable-next-line @typescript-eslint/unbound-method
-    return instance.close;
-  }, [wsUrl, onMessage]);
-
-  return { connected, data, updateData } as const;
-};
diff --git a/interface/vite.config.ts b/interface/vite.config.ts
index bb76b59ab..b5b69c560 100644
--- a/interface/vite.config.ts
+++ b/interface/vite.config.ts
@@ -1,4 +1,4 @@
-import { defineConfig } from 'vite';
+import { defineConfig, splitVendorChunkPlugin } from 'vite';
 import viteTsconfigPaths from 'vite-tsconfig-paths';
 import preact from '@preact/preset-vite';
 import viteImagemin from 'vite-plugin-imagemin';
@@ -44,6 +44,7 @@ export default defineConfig(({ command, mode }) => {
       plugins: [
         preact(),
         viteTsconfigPaths(),
+        splitVendorChunkPlugin(),
         {
           ...viteImagemin({
             verbose: false,
@@ -112,6 +113,20 @@ export default defineConfig(({ command, mode }) => {
           nameCache: null,
           safari10: false,
           toplevel: false
+        },
+
+        rollupOptions: {
+          output: {
+            manualChunks(id: string) {
+              if (id.includes('node_modules')) {
+                // creating a chunk to react routes deps. Reducing the vendor chunk size
+                if (id.includes('react-router-dom') || id.includes('@remix-run') || id.includes('react-router')) {
+                  return '@react-router';
+                }
+                return 'vendor';
+              }
+            }
+          }
         }
       }
     };
diff --git a/interface/yarn.lock b/interface/yarn.lock
index edde8f336..27da2bce1 100644
--- a/interface/yarn.lock
+++ b/interface/yarn.lock
@@ -12,10 +12,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@alova/adapter-xhr@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@alova/adapter-xhr@npm:1.0.2"
-  checksum: a57d178e89e3b655191bebccbc34d22760813b97b430e16f77b6ad561e3bb4ad8a34948aa2d724f5833d675f21a337ab769a3e5f73878430c3139374c6afb6ea
+"@alova/adapter-xhr@npm:^1.0.3":
+  version: 1.0.3
+  resolution: "@alova/adapter-xhr@npm:1.0.3"
+  checksum: 53923b0b7f833bbbda662ad28f29bb8226d2126ab7dcc57c9aa5486212cb02f0cfa19760d33ab63334688458138fc3c4713084c2f6a558c969d83efda7828601
   languageName: node
   linkType: hard
 
@@ -401,12 +401,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/runtime@npm:7.23.6"
+"@babel/runtime@npm:^7.23.8":
+  version: 7.23.8
+  resolution: "@babel/runtime@npm:7.23.8"
   dependencies:
     regenerator-runtime: "npm:^0.14.0"
-  checksum: 4c4ab16f0361c59fb23956e4d0a29935f1f8a64aa8dd37876ce38355b6f4d8f0e54237aacb89c73b1532def60539ddde2d651523c8fa887b30b19a8cf0c465b0
+  checksum: ec8f1967a36164da6cac868533ffdff97badd76d23d7d820cc84f0818864accef972f22f9c6a710185db1e3810e353fc18c3da721e5bb3ee8bc61bdbabce03ff
   languageName: node
   linkType: hard
 
@@ -841,41 +841,41 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^1.4.2":
-  version: 1.5.0
-  resolution: "@floating-ui/core@npm:1.5.0"
-  dependencies:
-    "@floating-ui/utils": "npm:^0.1.3"
-  checksum: 3182715a30493f44a32158f4d77ab5b6c212064b160cb84b5b8405ec2845bd8a9167c25292709e841cad9e70c6b9efdc30f876044e3b0909139fea8eca00c631
-  languageName: node
-  linkType: hard
-
-"@floating-ui/dom@npm:^1.5.1":
+"@floating-ui/core@npm:^1.5.3":
   version: 1.5.3
-  resolution: "@floating-ui/dom@npm:1.5.3"
+  resolution: "@floating-ui/core@npm:1.5.3"
   dependencies:
-    "@floating-ui/core": "npm:^1.4.2"
-    "@floating-ui/utils": "npm:^0.1.3"
-  checksum: d2d5ae7a0949c0ebf7fbf97a21612bf94dbd29cb6c847e00588b8e2a5575ade27c47cb19f5d230fc21a571d99aa0c714b301c9221d33921047408c0ed9d91a30
+    "@floating-ui/utils": "npm:^0.2.0"
+  checksum: 7d9feaca2565a2a71bf03d23cd292c03def63097d7fde7d62909cdb8ddb84664781f3922086bcf10443f3310cb92381a0ecf745b2774edb917fa74fe61015c56
   languageName: node
   linkType: hard
 
-"@floating-ui/react-dom@npm:^2.0.4":
-  version: 2.0.4
-  resolution: "@floating-ui/react-dom@npm:2.0.4"
+"@floating-ui/dom@npm:^1.5.4":
+  version: 1.5.4
+  resolution: "@floating-ui/dom@npm:1.5.4"
   dependencies:
-    "@floating-ui/dom": "npm:^1.5.1"
+    "@floating-ui/core": "npm:^1.5.3"
+    "@floating-ui/utils": "npm:^0.2.0"
+  checksum: 3ba02ba2b4227c1e18df6ccdd029a1c100058db2e76ca1dac60a593ec72b2d4d995fa5c2d1639a5c38adb17e12398fbfe4f6cf5fd45f2ee6170ed0cf64acea06
+  languageName: node
+  linkType: hard
+
+"@floating-ui/react-dom@npm:^2.0.5":
+  version: 2.0.5
+  resolution: "@floating-ui/react-dom@npm:2.0.5"
+  dependencies:
+    "@floating-ui/dom": "npm:^1.5.4"
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 4240a718502c797fd2e174cd06dcd7321a6eda9c8966dbaf61864b9e16445e95649a59bfe7c19ee13f68c11f3693724d7970c7e618089a3d3915bd343639cfae
+  checksum: b4fc008c725149b9565949184d844c914a8fa2687636c3c1166a1d52ca58537b3ba9b0a0e2945cf424662c846e60b173df0d325af7e700a31550e5e0b346070a
   languageName: node
   linkType: hard
 
-"@floating-ui/utils@npm:^0.1.3":
-  version: 0.1.6
-  resolution: "@floating-ui/utils@npm:0.1.6"
-  checksum: 450ec4ecc1dd8161b1904d4e1e9d95e653cc06f79af6c3b538b79efb10541d90bcc88646ab3cdffc5b92e00c4804ca727b025d153ad285f42dbbb39aec219ec9
+"@floating-ui/utils@npm:^0.2.0":
+  version: 0.2.1
+  resolution: "@floating-ui/utils@npm:0.2.1"
+  checksum: 33c9ab346e7b05c5a1e6a95bc902aafcfc2c9d513a147e2491468843bd5607531b06d0b9aa56aa491cbf22a6c2495c18ccfc4c0344baec54a689a7bb8e4898d6
   languageName: node
   linkType: hard
 
@@ -970,16 +970,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@mui/base@npm:5.0.0-beta.30":
-  version: 5.0.0-beta.30
-  resolution: "@mui/base@npm:5.0.0-beta.30"
+"@mui/base@npm:5.0.0-beta.32":
+  version: 5.0.0-beta.32
+  resolution: "@mui/base@npm:5.0.0-beta.32"
   dependencies:
-    "@babel/runtime": "npm:^7.23.6"
-    "@floating-ui/react-dom": "npm:^2.0.4"
-    "@mui/types": "npm:^7.2.12"
-    "@mui/utils": "npm:^5.15.3"
+    "@babel/runtime": "npm:^7.23.8"
+    "@floating-ui/react-dom": "npm:^2.0.5"
+    "@mui/types": "npm:^7.2.13"
+    "@mui/utils": "npm:^5.15.5"
     "@popperjs/core": "npm:^2.11.8"
-    clsx: "npm:^2.0.0"
+    clsx: "npm:^2.1.0"
     prop-types: "npm:^15.8.1"
   peerDependencies:
     "@types/react": ^17.0.0 || ^18.0.0
@@ -988,22 +988,22 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 55e18d59ac96f5bbfbfdadd907751f5e6a4f74f611b5e99fe5f8002c76fa117b62c159f52ea0f12574a66460d62734082438cff19cb73e3fca9dc22f82f6eaf2
+  checksum: c88cd8a412ecaeaf0040e20708b2a607b9594a4462449ad06b90e96465aad0dada23295f801ed72851025fd023ababc410b6a48fcb69d7cdef90b55e62aa9a11
   languageName: node
   linkType: hard
 
-"@mui/core-downloads-tracker@npm:^5.15.3":
-  version: 5.15.3
-  resolution: "@mui/core-downloads-tracker@npm:5.15.3"
-  checksum: 002451af1aa555c0163c0ffacde5c15062e0ae0f30b81945e1a0befe7b6c5d14924a2b068b7b5f713c177ee3eecca4fc250d590d11206a6b5465700c399a34d1
+"@mui/core-downloads-tracker@npm:^5.15.5":
+  version: 5.15.5
+  resolution: "@mui/core-downloads-tracker@npm:5.15.5"
+  checksum: 4c9b1281ebe8d17d402e22f7f50c347c0b3918b1ed17af721f4de5ce282d90bc6d90fe9730595998b2bbb2f7ebe57fc55d4c858f31754fccdb606af472a59dc8
   languageName: node
   linkType: hard
 
-"@mui/icons-material@npm:^5.15.3":
-  version: 5.15.3
-  resolution: "@mui/icons-material@npm:5.15.3"
+"@mui/icons-material@npm:^5.15.5":
+  version: 5.15.5
+  resolution: "@mui/icons-material@npm:5.15.5"
   dependencies:
-    "@babel/runtime": "npm:^7.23.6"
+    "@babel/runtime": "npm:^7.23.8"
   peerDependencies:
     "@mui/material": ^5.0.0
     "@types/react": ^17.0.0 || ^18.0.0
@@ -1011,22 +1011,22 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 2393a9dcd0834cdda728b8ebca5d8f6acbfc34316346aaea257e32961abf7cf578419df196b50223b89b3e2556098aea283786ca4eeedaf58be3d204f499f6bc
+  checksum: 25feb86a76ce83c81391c95d0c1c867e988cc7bc1b5a05c5698b71cb3cd1005fd148b07c2fa8908cda9fc4e44ea8b6e0fd2197bc0abafac0ee4880b477852eea
   languageName: node
   linkType: hard
 
-"@mui/material@npm:^5.15.3":
-  version: 5.15.3
-  resolution: "@mui/material@npm:5.15.3"
+"@mui/material@npm:^5.15.5":
+  version: 5.15.5
+  resolution: "@mui/material@npm:5.15.5"
   dependencies:
-    "@babel/runtime": "npm:^7.23.6"
-    "@mui/base": "npm:5.0.0-beta.30"
-    "@mui/core-downloads-tracker": "npm:^5.15.3"
-    "@mui/system": "npm:^5.15.3"
-    "@mui/types": "npm:^7.2.12"
-    "@mui/utils": "npm:^5.15.3"
+    "@babel/runtime": "npm:^7.23.8"
+    "@mui/base": "npm:5.0.0-beta.32"
+    "@mui/core-downloads-tracker": "npm:^5.15.5"
+    "@mui/system": "npm:^5.15.5"
+    "@mui/types": "npm:^7.2.13"
+    "@mui/utils": "npm:^5.15.5"
     "@types/react-transition-group": "npm:^4.4.10"
-    clsx: "npm:^2.0.0"
+    clsx: "npm:^2.1.0"
     csstype: "npm:^3.1.2"
     prop-types: "npm:^15.8.1"
     react-is: "npm:^18.2.0"
@@ -1044,16 +1044,16 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: fe8d318aed036b649a82e4833254f833ece028b6a25cec001991e6864d9e520752df6a746b6ca856c0310cc9aae16697aa77ddf53a85c889bb5d04c5aa5c1dcb
+  checksum: 2a094d94acfc8f945b6cc73b295799f3174d7292707230e9b9486d810990561778f5f228f2fdc13a064ae234d528fb28c9b53f6c487ca43e65dc17460886165c
   languageName: node
   linkType: hard
 
-"@mui/private-theming@npm:^5.15.3":
-  version: 5.15.3
-  resolution: "@mui/private-theming@npm:5.15.3"
+"@mui/private-theming@npm:^5.15.5":
+  version: 5.15.5
+  resolution: "@mui/private-theming@npm:5.15.5"
   dependencies:
-    "@babel/runtime": "npm:^7.23.6"
-    "@mui/utils": "npm:^5.15.3"
+    "@babel/runtime": "npm:^7.23.8"
+    "@mui/utils": "npm:^5.15.5"
     prop-types: "npm:^15.8.1"
   peerDependencies:
     "@types/react": ^17.0.0 || ^18.0.0
@@ -1061,15 +1061,15 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 4404a7d9545974631b329f391df72fa54edb5aefa6d32d9656b200284613e8ea1bdd3d0add2abe7278f1343dd5cf7552c7e4d2aaf5593f292c7db3cd63ddff21
+  checksum: 1b26bc897417dcd91bbc65af3584c3cdf6704e9beb707c97bb7977962536213d7c7bf8e1004cbe86a19625ed5feba82d3ad2997e943138ed36114a8a36bf0fed
   languageName: node
   linkType: hard
 
-"@mui/styled-engine@npm:^5.15.3":
-  version: 5.15.3
-  resolution: "@mui/styled-engine@npm:5.15.3"
+"@mui/styled-engine@npm:^5.15.5":
+  version: 5.15.5
+  resolution: "@mui/styled-engine@npm:5.15.5"
   dependencies:
-    "@babel/runtime": "npm:^7.23.6"
+    "@babel/runtime": "npm:^7.23.8"
     "@emotion/cache": "npm:^11.11.0"
     csstype: "npm:^3.1.2"
     prop-types: "npm:^15.8.1"
@@ -1082,20 +1082,20 @@ __metadata:
       optional: true
     "@emotion/styled":
       optional: true
-  checksum: 6775f92cda9f17428baf5b95e5849f31eead92485e332902ff29bd49bd03fbe2f5e762ebcdd122f7f31e102ec42cda29cbb5fdef79f5d03f416705d119b69e75
+  checksum: 10e38ed39f7defc26d7e14e9634afcd9d540eaa1b9aeb957a6d1154a14a3cca2843e9aa7ead126604728bbf2125203c1f157059c06b397ed0278fc4b7cfae5c5
   languageName: node
   linkType: hard
 
-"@mui/system@npm:^5.15.3":
-  version: 5.15.3
-  resolution: "@mui/system@npm:5.15.3"
+"@mui/system@npm:^5.15.5":
+  version: 5.15.5
+  resolution: "@mui/system@npm:5.15.5"
   dependencies:
-    "@babel/runtime": "npm:^7.23.6"
-    "@mui/private-theming": "npm:^5.15.3"
-    "@mui/styled-engine": "npm:^5.15.3"
-    "@mui/types": "npm:^7.2.12"
-    "@mui/utils": "npm:^5.15.3"
-    clsx: "npm:^2.0.0"
+    "@babel/runtime": "npm:^7.23.8"
+    "@mui/private-theming": "npm:^5.15.5"
+    "@mui/styled-engine": "npm:^5.15.5"
+    "@mui/types": "npm:^7.2.13"
+    "@mui/utils": "npm:^5.15.5"
+    clsx: "npm:^2.1.0"
     csstype: "npm:^3.1.2"
     prop-types: "npm:^15.8.1"
   peerDependencies:
@@ -1110,27 +1110,27 @@ __metadata:
       optional: true
     "@types/react":
       optional: true
-  checksum: 7b71cad3c3b4f8136cf51a9e7040440073201618eaa5d0fcbd8830e3c3f35eb8a38303bb2bc9da84e0c95844193fdb4238af50e1f1d74a8e9fa79500a49c31db
+  checksum: bc40858eff92efe1424b4de5782ca48ec0bccfe2de244b00af8f8607a7f47b5ec7006a0e369d1c52ddb3fe01d7666d1f7ed6d9a9070bee28dfa4ab2cecc4d015
   languageName: node
   linkType: hard
 
-"@mui/types@npm:^7.2.12":
-  version: 7.2.12
-  resolution: "@mui/types@npm:7.2.12"
+"@mui/types@npm:^7.2.13":
+  version: 7.2.13
+  resolution: "@mui/types@npm:7.2.13"
   peerDependencies:
     "@types/react": ^17.0.0 || ^18.0.0
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: 7d3ef53fee7eddc063d2083dc129f7d6d38b472a9196c3522fc5a75e66849fbf2b824be3f6aee11dc02c4475864e544026e6051ffb9d33f5dc1fc2a2279a8b72
+  checksum: a35bff025f715073329bd7cbe11ef4ce331ea377adffc0c5cd264bea47283590ce928d1fdbbc27506d1d462151325c81e71f2378ac4335feef3042010bbf3fcd
   languageName: node
   linkType: hard
 
-"@mui/utils@npm:^5.15.3":
-  version: 5.15.3
-  resolution: "@mui/utils@npm:5.15.3"
+"@mui/utils@npm:^5.15.5":
+  version: 5.15.5
+  resolution: "@mui/utils@npm:5.15.5"
   dependencies:
-    "@babel/runtime": "npm:^7.23.6"
+    "@babel/runtime": "npm:^7.23.8"
     "@types/prop-types": "npm:^15.7.11"
     prop-types: "npm:^15.8.1"
     react-is: "npm:^18.2.0"
@@ -1140,7 +1140,7 @@ __metadata:
   peerDependenciesMeta:
     "@types/react":
       optional: true
-  checksum: c4d66e34332f448527c6dea66a7011f95dc230ccaf5a3ee898a6fd69b77a3584af1fd644d095dc7edb2d480e5c050db06f9b9ec9dea3bc5091a80cf8b676f709
+  checksum: c8ff39a23ec540c6fd6495e44df6dc5531afca535cbb605f81cd5ef66af946e6c6415290caade8cfa0f61ecfb55703d8065c4968530c0b54c52d44f23a04cbfe
   languageName: node
   linkType: hard
 
@@ -1277,10 +1277,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.14.1":
-  version: 1.14.1
-  resolution: "@remix-run/router@npm:1.14.1"
-  checksum: caed61639006444a66ca832f1e500bac2fcf02695183e967ff1452d3172f888f2bb40591b239c85f9003b9628383cfd4c8ef55cde800d14276905c7031c9f0b9
+"@remix-run/router@npm:1.14.2":
+  version: 1.14.2
+  resolution: "@remix-run/router@npm:1.14.2"
+  checksum: 422844e88b985f1e287301b302c6cf8169c9eea792f80d40464f97b25393bb2e697228ebd7a7b61444d5a51c5873c4a637aad20acde5886a5caf62e833c5ceee
   languageName: node
   linkType: hard
 
@@ -1568,12 +1568,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node@npm:^20.10.6":
-  version: 20.10.6
-  resolution: "@types/node@npm:20.10.6"
+"@types/node@npm:^20.11.5":
+  version: 20.11.5
+  resolution: "@types/node@npm:20.11.5"
   dependencies:
     undici-types: "npm:~5.26.4"
-  checksum: 08471220d3cbbb6669835c4b78541edf5eface8f2c2e36c550cfa4ff73da73071c90e200a06359fac25d6564127597c23e178128058fb676824ec23d5178a017
+  checksum: 9f31c471047d7b3e240ce7b77ff29b0d15e83be7e3feafb3d0b0d0931122b438b1eefa302a5a2e1e9849914ff3fd76aafbd8ccb372efb1331ba048da63bce6f8
   languageName: node
   linkType: hard
 
@@ -1648,14 +1648,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react@npm:^18.2.46":
-  version: 18.2.46
-  resolution: "@types/react@npm:18.2.46"
+"@types/react@npm:^18.2.48":
+  version: 18.2.48
+  resolution: "@types/react@npm:18.2.48"
   dependencies:
     "@types/prop-types": "npm:*"
     "@types/scheduler": "npm:*"
     csstype: "npm:^3.0.2"
-  checksum: 10fb28a5b8504106512ce3b154c45d1ac045c31633786773a29f003b3079b434060368bb56f95ef6c39510835ceec4fb8fdc271d6ca2b9cdd979379cf53f126b
+  checksum: 2e56ea6bd821ae96bd943f727a59d85384eaf5f8a3e6fce4fa1d34453e32d8eedda742432b3857fa0de7a4214bf84ce4239757eb52918e76452c00384731e585
   languageName: node
   linkType: hard
 
@@ -1691,15 +1691,15 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:^6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.17.0"
+"@typescript-eslint/eslint-plugin@npm:^6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/eslint-plugin@npm:6.19.0"
   dependencies:
     "@eslint-community/regexpp": "npm:^4.5.1"
-    "@typescript-eslint/scope-manager": "npm:6.17.0"
-    "@typescript-eslint/type-utils": "npm:6.17.0"
-    "@typescript-eslint/utils": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    "@typescript-eslint/scope-manager": "npm:6.19.0"
+    "@typescript-eslint/type-utils": "npm:6.19.0"
+    "@typescript-eslint/utils": "npm:6.19.0"
+    "@typescript-eslint/visitor-keys": "npm:6.19.0"
     debug: "npm:^4.3.4"
     graphemer: "npm:^1.4.0"
     ignore: "npm:^5.2.4"
@@ -1712,44 +1712,44 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: f2a5774e9cc03e491a5a488501e5622c7eebd766f5a4fc2c30642864a3b89b0807946bde33a678f326ba7032f3f6a51aa0bf9c2d10adc823804fc9fb47db55a6
+  checksum: 5ed8483d792c4bc6ed697159c84a47ba5c35cd124949883813f2053b972537de3900a7ae26d4d6f370194f2cc7929baa2d09268e0b90118f20ed961cf6c176b9
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:^6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/parser@npm:6.17.0"
+"@typescript-eslint/parser@npm:^6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/parser@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/scope-manager": "npm:6.17.0"
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/typescript-estree": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    "@typescript-eslint/scope-manager": "npm:6.19.0"
+    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/typescript-estree": "npm:6.19.0"
+    "@typescript-eslint/visitor-keys": "npm:6.19.0"
     debug: "npm:^4.3.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 2ed0ed4a5b30e953430ce3279df3655af09fa1caed2abf11804d239717daefc32a22864f6620ef57bb9c684c74a99a13241384fea5096e961385e3678fc2e920
+  checksum: 0c6280a69127cf521b3403be9877775eecda2b2e4e44a67874b0d9cf82ed95a7971dac2db633e55ec22f8026da2681137110b2924313421a22b7c03eba8cda67
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.17.0"
+"@typescript-eslint/scope-manager@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/scope-manager@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
-  checksum: fe09c628553c9336e6a36d32c1d34e78ebd20aa02130a6bf535329621ba5a98aaac171f607bc6e4d17b3478c42e7de6476376636897ce3f227c754eb99acd07e
+    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/visitor-keys": "npm:6.19.0"
+  checksum: d36c51c05e14c51ce13181120eeea46d1edd59ed1ff16dc4ec1f5532a975b5faec5c10a373aaa90545f82a12330c6cba18ecedc734e18288f5874855c48ba808
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/type-utils@npm:6.17.0"
+"@typescript-eslint/type-utils@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/type-utils@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/typescript-estree": "npm:6.17.0"
-    "@typescript-eslint/utils": "npm:6.17.0"
+    "@typescript-eslint/typescript-estree": "npm:6.19.0"
+    "@typescript-eslint/utils": "npm:6.19.0"
     debug: "npm:^4.3.4"
     ts-api-utils: "npm:^1.0.1"
   peerDependencies:
@@ -1757,23 +1757,23 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: dc7938429193acfda61b7282197ec046039e2c4da41cdcddf4daaf300d10229e4e23bb0fcf0503b19c0b99a874849c8a9f5bb35ce106260f56a14106d2b41d8c
+  checksum: f1f20ac28c03dd18546050b63ec0b0fd8c67780265ccb9ef566f16441c3de5deb2607a6046fefdebe8a43ac11fecdf0b009f8e5f70a3d15916d855be74b0f3bb
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/types@npm:6.17.0"
-  checksum: 87ab1b5a3270ab34b917c22a2fb90a9ad7d9f3b19d73a337bc9efbe65f924da13482c97e8ccbe3bd3d081aa96039eeff50de41c1da2a2128066429b931cdb21d
+"@typescript-eslint/types@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/types@npm:6.19.0"
+  checksum: 396ad2ad9f2d759dd87bc880a1ffc9d11fda04db8af9402abb4e8eccd58c01fa2d26e38b186526d0b457012f7c912e7afdab2a3798a73aa0ae34abaf50d617ae
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.17.0"
+"@typescript-eslint/typescript-estree@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/typescript-estree@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/visitor-keys": "npm:6.17.0"
+    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/visitor-keys": "npm:6.19.0"
     debug: "npm:^4.3.4"
     globby: "npm:^11.1.0"
     is-glob: "npm:^4.0.3"
@@ -1783,34 +1783,34 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 1671b0d2f2fdf07074fb1e2524d61935cec173bd8db6e482cc5b2dcc77aed3ffa831396736ffa0ee2fdbddd8585ae9ca8d6c97bcaea1385b23907a1ec0508f83
+  checksum: 06e24bb145a302299a6cf86b36652bd4d7080c4e88517ebc24bdc137c57425a68db256ba628ce16b568bfec8020ae2a748ccee93e304efeded329cb3292b17bf
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/utils@npm:6.17.0"
+"@typescript-eslint/utils@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/utils@npm:6.19.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.4.0"
     "@types/json-schema": "npm:^7.0.12"
     "@types/semver": "npm:^7.5.0"
-    "@typescript-eslint/scope-manager": "npm:6.17.0"
-    "@typescript-eslint/types": "npm:6.17.0"
-    "@typescript-eslint/typescript-estree": "npm:6.17.0"
+    "@typescript-eslint/scope-manager": "npm:6.19.0"
+    "@typescript-eslint/types": "npm:6.19.0"
+    "@typescript-eslint/typescript-estree": "npm:6.19.0"
     semver: "npm:^7.5.4"
   peerDependencies:
     eslint: ^7.0.0 || ^8.0.0
-  checksum: 37c63afcf66124bf84808699997953b8c84a378aa2c490a771b611d82cdac8499c58fac8eeb8378528e97660b59563d99297bfec4b982cd68760b0ffe54aa714
+  checksum: 4080c36331204ffef9f218e29f43da767f17551fa4d3877c3d3b49194f7c7382dd9ae2124e7b5ebd47d5556946bb6ad195b47d7d215553efabacdebf81b9e74d
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.17.0":
-  version: 6.17.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.17.0"
+"@typescript-eslint/visitor-keys@npm:6.19.0":
+  version: 6.19.0
+  resolution: "@typescript-eslint/visitor-keys@npm:6.19.0"
   dependencies:
-    "@typescript-eslint/types": "npm:6.17.0"
+    "@typescript-eslint/types": "npm:6.19.0"
     eslint-visitor-keys: "npm:^3.4.1"
-  checksum: a2aed0e1437fdab8858ab9c7c8e355f8b72a5fa4b0adc54f28b8a2bbc29d4bb93214968ee940f83d013d0a4b83d00cd4eeeb05fb4c2c7d0ead324c6793f7d6d4
+  checksum: 8d51c0b8d94c5df044fde958f62741cef55be97c6a3a16c47e4df9af7b2ff13aa1ee03ca5240777481dca53f3b7a9b00b329e50aff5e3ad829d96bc5f63ca2c3
   languageName: node
   linkType: hard
 
@@ -1825,24 +1825,24 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "EMS-ESP@workspace:."
   dependencies:
-    "@alova/adapter-xhr": "npm:^1.0.2"
+    "@alova/adapter-xhr": "npm:^1.0.3"
     "@babel/core": "npm:^7.23.7"
     "@emotion/react": "npm:^11.11.3"
     "@emotion/styled": "npm:^11.11.0"
-    "@mui/icons-material": "npm:^5.15.3"
-    "@mui/material": "npm:^5.15.3"
+    "@mui/icons-material": "npm:^5.15.5"
+    "@mui/material": "npm:^5.15.5"
     "@preact/compat": "npm:^17.1.2"
     "@preact/preset-vite": "npm:^2.8.1"
     "@table-library/react-table-library": "npm:4.1.7"
     "@types/imagemin": "npm:^8.0.5"
     "@types/lodash-es": "npm:^4.17.12"
-    "@types/node": "npm:^20.10.6"
-    "@types/react": "npm:^18.2.46"
+    "@types/node": "npm:^20.11.5"
+    "@types/react": "npm:^18.2.48"
     "@types/react-dom": "npm:^18.2.18"
     "@types/react-router-dom": "npm:^5.3.3"
-    "@typescript-eslint/eslint-plugin": "npm:^6.17.0"
-    "@typescript-eslint/parser": "npm:^6.17.0"
-    alova: "npm:^2.16.2"
+    "@typescript-eslint/eslint-plugin": "npm:^6.19.0"
+    "@typescript-eslint/parser": "npm:^6.19.0"
+    alova: "npm:^2.17.0"
     async-validator: "npm:^4.2.5"
     concurrently: "npm:^8.2.2"
     eslint: "npm:^8.56.0"
@@ -1861,21 +1861,21 @@ __metadata:
     lodash-es: "npm:^4.17.21"
     mime-types: "npm:^2.1.35"
     preact: "npm:^10.19.3"
-    prettier: "npm:^3.1.1"
+    prettier: "npm:^3.2.4"
     react: "npm:latest"
     react-dom: "npm:latest"
     react-dropzone: "npm:^14.2.3"
-    react-icons: "npm:^4.12.0"
-    react-router-dom: "npm:^6.21.1"
-    react-toastify: "npm:^9.1.3"
+    react-icons: "npm:^5.0.1"
+    react-router-dom: "npm:^6.21.3"
+    react-toastify: "npm:^10.0.4"
     rollup-plugin-visualizer: "npm:^5.12.0"
     sockette: "npm:^2.0.6"
-    terser: "npm:^5.26.0"
+    terser: "npm:^5.27.0"
     typesafe-i18n: "npm:^5.26.2"
     typescript: "npm:^5.3.3"
-    vite: "npm:^5.0.10"
+    vite: "npm:^5.0.12"
     vite-plugin-imagemin: "npm:^0.6.1"
-    vite-tsconfig-paths: "npm:^4.2.3"
+    vite-tsconfig-paths: "npm:^4.3.1"
   languageName: unknown
   linkType: soft
 
@@ -1944,10 +1944,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"alova@npm:^2.16.2":
-  version: 2.16.2
-  resolution: "alova@npm:2.16.2"
-  checksum: 06fafddf380d4d8e8e5dd172ebcaa0bc229c76c11b2675cfb2c0ab884a36d4818159267adb14ec7a3cbe681464793085b0386d7741e6a6a732c764b14c8783a8
+"alova@npm:^2.17.0":
+  version: 2.17.0
+  resolution: "alova@npm:2.17.0"
+  checksum: ff3bda492ac7dc8665403293644736ab90d7989a8479cfb2fa7fcab8fdb6e92b755851e5bcae07f55f5a5170c66c6486f047d19efb8ca39b6b3298717c3f50d7
   languageName: node
   linkType: hard
 
@@ -2617,17 +2617,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"clsx@npm:^1.1.1":
-  version: 1.2.1
-  resolution: "clsx@npm:1.2.1"
-  checksum: 5ded6f61f15f1fa0350e691ccec43a28b12fb8e64c8e94715f2a937bc3722d4c3ed41d6e945c971fc4dcc2a7213a43323beaf2e1c28654af63ba70c9968a8643
-  languageName: node
-  linkType: hard
-
-"clsx@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "clsx@npm:2.0.0"
-  checksum: 943766d1b02fee3538c871e56638d87f973fbc2d6291ce221215ea436fdecb9be97ad323f411839c2d52c45640c449b1a53fbfe7e8b3d529b4e263308b630c9a
+"clsx@npm:^2.1.0":
+  version: 2.1.0
+  resolution: "clsx@npm:2.1.0"
+  checksum: 2e0ce7c3b6803d74fc8147c408f88e79245583202ac14abd9691e2aebb9f312de44270b79154320d10bb7804a9197869635d1291741084826cff20820f31542b
   languageName: node
   linkType: hard
 
@@ -7091,12 +7084,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "prettier@npm:3.1.1"
+"prettier@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "prettier@npm:3.2.4"
   bin:
     prettier: bin/prettier.cjs
-  checksum: 26a249f321b97d26c04483f1bf2eeb22e082a76f4222a2c922bebdc60111691aad4ec3979610e83942e0b956058ec361d9e9c81c185172264eb6db9aa678082b
+  checksum: e2b735d0552501b3a7ac8bd3ba3b6de2920bb35bd4cd02d08cb9057ebe3e96d83b9a7e4b903d987b7530a50223b12c74d107c154337236ae2c68156ba1e65cd2
   languageName: node
   linkType: hard
 
@@ -7202,12 +7195,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-icons@npm:^4.12.0":
-  version: 4.12.0
-  resolution: "react-icons@npm:4.12.0"
+"react-icons@npm:^5.0.1":
+  version: 5.0.1
+  resolution: "react-icons@npm:5.0.1"
   peerDependencies:
     react: "*"
-  checksum: 5cc20509ca0b182f1e7bf42c271846c48f688c8922e2439f48728805adc93ba18476a13588cbe91ee43a2d03b2787e0dc0b5cc4b9c4e4ae3426f4464b3c1b734
+  checksum: c4458c643ae32a793ddebc5fa1235c7ec051be1b131205510e8199d15a4c89221a501f95a71fa21c2da93e8dd225290e2e24bb80abd3fb85801e43009e692098
   languageName: node
   linkType: hard
 
@@ -7225,39 +7218,39 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:^6.21.1":
-  version: 6.21.1
-  resolution: "react-router-dom@npm:6.21.1"
+"react-router-dom@npm:^6.21.3":
+  version: 6.21.3
+  resolution: "react-router-dom@npm:6.21.3"
   dependencies:
-    "@remix-run/router": "npm:1.14.1"
-    react-router: "npm:6.21.1"
+    "@remix-run/router": "npm:1.14.2"
+    react-router: "npm:6.21.3"
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: 2d75bd889828fa5516ad076b44506656d826c365645e7079138cd0ef899db28a1b212f708a6c6e3b543ae11b96b2031f01201cc2fe1733dd4d9c5cbdd4d734ef
+  checksum: 6e23e35d02e5c83847c8e47d7912d1f6c2c42a35f2317802031bdd993a8205468138a045ff34f67fe807fe9f7dc9d0995ee05bab25aedc0bf978e620ac132815
   languageName: node
   linkType: hard
 
-"react-router@npm:6.21.1":
-  version: 6.21.1
-  resolution: "react-router@npm:6.21.1"
+"react-router@npm:6.21.3":
+  version: 6.21.3
+  resolution: "react-router@npm:6.21.3"
   dependencies:
-    "@remix-run/router": "npm:1.14.1"
+    "@remix-run/router": "npm:1.14.2"
   peerDependencies:
     react: ">=16.8"
-  checksum: 1220cc75e0c915a26dde9dbb6509a8f0b0163d96e5ad591af91d9bb5a92a18401718f8d872a03d1cb366e7a6216c165a5cadd12375adf97943f37d7f5c487a90
+  checksum: 3d5107cfdb440519d84e6ad6d95454e3bf41ec97677b95f7b2a7f281f8ddf191b765cf1b599ead951f3cd33ed4429f140590d74a01cfdf835dc2f812023a978a
   languageName: node
   linkType: hard
 
-"react-toastify@npm:^9.1.3":
-  version: 9.1.3
-  resolution: "react-toastify@npm:9.1.3"
+"react-toastify@npm:^10.0.4":
+  version: 10.0.4
+  resolution: "react-toastify@npm:10.0.4"
   dependencies:
-    clsx: "npm:^1.1.1"
+    clsx: "npm:^2.1.0"
   peerDependencies:
     react: ">=16"
     react-dom: ">=16"
-  checksum: 12667aa10e6cf3f74be2e3c704c2d5570dd7de66fff89ae38fbfab1122e9a9f632de1cb712fe44a9a60b8ecca7590578157cb4ca6c4e8105a8cf80936a94e181
+  checksum: 57f4d0032bf328381bdfeb78ab5efa988d425627a61ffa43b0caa184633a0ea44253a349d6b967247fa3d480ad82a2bbaa9063ce3f89be9550eb9b30398a6837
   languageName: node
   linkType: hard
 
@@ -8345,9 +8338,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"terser@npm:^5.26.0":
-  version: 5.26.0
-  resolution: "terser@npm:5.26.0"
+"terser@npm:^5.27.0":
+  version: 5.27.0
+  resolution: "terser@npm:5.27.0"
   dependencies:
     "@jridgewell/source-map": "npm:^0.3.3"
     acorn: "npm:^8.8.2"
@@ -8355,7 +8348,7 @@ __metadata:
     source-map-support: "npm:~0.5.20"
   bin:
     terser: bin/terser
-  checksum: 0282c5c065cbfa1e725d5609b99579252bc20b83cd1d75e8ab8b46d5da2c9d0fcfc453a12624f2d2d4c1240bfa0017a90fcf1e3b88258e5842fca1b0b82be8d8
+  checksum: 9b2c5cb00747dea5994034ca064fb3cc7efc1be6b79a35247662d51ab43bdbe9cbf002bbf29170b5f3bd068c811d0212e22d94acd2cf0d8562687b96f1bffc9f
   languageName: node
   linkType: hard
 
@@ -8444,17 +8437,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tsconfck@npm:^2.1.0":
-  version: 2.1.2
-  resolution: "tsconfck@npm:2.1.2"
+"tsconfck@npm:^3.0.1":
+  version: 3.0.1
+  resolution: "tsconfck@npm:3.0.1"
   peerDependencies:
-    typescript: ^4.3.5 || ^5.0.0
+    typescript: ^5.0.0
   peerDependenciesMeta:
     typescript:
       optional: true
   bin:
     tsconfck: bin/tsconfck.js
-  checksum: 61df3b03b334a25eabb0a52e67a0c8d85770c631f2739db7703af8fdd102a2ebd598f1c851cc5fc6d6a59f2497a26c845be71c934ea16d838a3ff95a885034fb
+  checksum: c5317404e2a809af31ad093f82365518a5856b2f342371991f729f42cab0def1b87dca8d22df3fb8c82acda7248710d4fb5030270db024c8000bc8272a3e6d58
   languageName: node
   linkType: hard
 
@@ -8755,25 +8748,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"vite-tsconfig-paths@npm:^4.2.3":
-  version: 4.2.3
-  resolution: "vite-tsconfig-paths@npm:4.2.3"
+"vite-tsconfig-paths@npm:^4.3.1":
+  version: 4.3.1
+  resolution: "vite-tsconfig-paths@npm:4.3.1"
   dependencies:
     debug: "npm:^4.1.1"
     globrex: "npm:^0.1.2"
-    tsconfck: "npm:^2.1.0"
+    tsconfck: "npm:^3.0.1"
   peerDependencies:
     vite: "*"
   peerDependenciesMeta:
     vite:
       optional: true
-  checksum: ba6abe5d18fc1c1e494e1f1d8a7db56445c2a40e15aadb5d47a9c66cc5372d6f69b94ff0b1e47b67659d6ecaeddebab0a9d11e40b1c3c36c0115800736a6c760
+  checksum: 1432f80750f5cbe181c265eb9fc2e9fff8b25a2858f176dc0a02311e3e826333526ee9c16bb0aaaa8555a417ea944d68a2e8225181215cd9502370f913eb3f79
   languageName: node
   linkType: hard
 
-"vite@npm:^5.0.10":
-  version: 5.0.10
-  resolution: "vite@npm:5.0.10"
+"vite@npm:^5.0.12":
+  version: 5.0.12
+  resolution: "vite@npm:5.0.12"
   dependencies:
     esbuild: "npm:^0.19.3"
     fsevents: "npm:~2.3.3"
@@ -8807,7 +8800,7 @@ __metadata:
       optional: true
   bin:
     vite: bin/vite.js
-  checksum: 5421e9c7f8cf3152eace9a8b528269141635f367e5dc63c5f1fe2712a766d9757f8197733cf3f28be590afdd520130d38de90c955e6dba6edfa6f9056c1e5ea7
+  checksum: ed0bb26a0d0c8e1dae0b70af9e36adffd7e15d80297443fe4da762596dc81570bad7f0291f590a57c1553f5e435338d8c7ffc483bd9431a95c09d9ac90665fad
   languageName: node
   linkType: hard
 
diff --git a/lib/ArduinoJson/ArduinoJson.h b/lib/ArduinoJson/ArduinoJson.h
index 15c218f48..993959949 100644
--- a/lib/ArduinoJson/ArduinoJson.h
+++ b/lib/ArduinoJson/ArduinoJson.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #include "src/ArduinoJson.h"
diff --git a/lib/ArduinoJson/CHANGELOG.md b/lib/ArduinoJson/CHANGELOG.md
index 28c506ab2..e82281e20 100644
--- a/lib/ArduinoJson/CHANGELOG.md
+++ b/lib/ArduinoJson/CHANGELOG.md
@@ -1,854 +1,123 @@
 ArduinoJson: change log
 =======================
 
-v6.21.3 (2023-07-23)
--------
+v7.0.2 (2024-01-19)
+------
 
-* Fix compatibility with the Blynk libary (issue #1914)
+* Fix assertion `poolIndex < count_` after `JsonDocument::clear()` (issue #2034)
+
+v7.0.1 (2024-01-10)
+------
+
+* Fix "no matching function" with `JsonObjectConst::operator[]` (issue #2019)
+* Remove unused files in the PlatformIO package
+* Fix `volatile bool` serialized as `1` or `0` instead of `true` or `false` (issue #2029)
+
+v7.0.0 (2024-01-03)
+------
+
+* Remove `BasicJsonDocument`
+* Remove `StaticJsonDocument`
+* Add abstract `Allocator` class
+* Merge `DynamicJsonDocument` with `JsonDocument`
+* Remove `JSON_ARRAY_SIZE()`, `JSON_OBJECT_SIZE()`, and `JSON_STRING_SIZE()`
+* Remove `ARDUINOJSON_ENABLE_STRING_DEDUPLICATION` (string deduplication cannot be disabled anymore)
+* Remove `JsonDocument::capacity()`
+* Store the strings in the heap
+* Reference-count shared strings
+* Always store `serialized("string")` by copy (#1915)
+* Remove the zero-copy mode of `deserializeJson()` and `deserializeMsgPack()`
 * Fix double lookup in `to<JsonVariant>()`
 * Fix double call to `size()` in `serializeMsgPack()`
 * Include `ARDUINOJSON_SLOT_OFFSET_SIZE` in the namespace name
+* Remove `JsonVariant::shallowCopy()`
+* `JsonDocument`'s capacity grows as needed, no need to pass it to the constructor anymore
+* `JsonDocument`'s allocator is not monotonic anymore, removed values get recycled
 * Show a link to the documentation when user passes an unsupported input type
-
-v6.21.2 (2023-04-12)
--------
-
-* Fix compatibility with the Zephyr Project (issue #1905)
-* Allow using PROGMEM outside of Arduino (issue #1903)
-* Set default for `ARDUINOJSON_ENABLE_PROGMEM` to `1` on AVR
-
-v6.21.1 (2023-03-27)
--------
-
-* Double speed of `DynamicJsonDocument::garbageCollect()`
-* Fix compatibility with GCC 5.2 (issue #1897)
-
-v6.21.0 (2023-03-14)
--------
-
-* Drop support for C++98/C++03. Minimum required is C++11.
-* Remove `ARDUINOJSON_NAMESPACE`; use `ArduinoJson` instead.
-* Make string support generic (issue #1807)
-
-v6.20.1 (2023-02-08)
--------
-
-* Remove explicit exclusion of `as<char*>()` and `as<char>()` (issue #1860)
-  If you try to call them, you'll now get the same error message as any unsupported type.
-  You could also add a custom converter for `char*` and `char`.
-
-v6.20.0 (2022-12-26)
--------
-
-* Add `JsonVariant::shallowCopy()` (issue #1343)
-* Fix `9.22337e+18 is outside the range of representable values of type 'long'`
-* Fix comparison operators for `JsonArray`, `JsonArrayConst`, `JsonObject`, and `JsonObjectConst`
-* Fix lax parsing of `true`, `false`, and `null` (issue #1781)
-* Remove undocumented `accept()` functions
-* Rename `addElement()` to `add()`
-* Remove `getElement()`, `getOrAddElement()`, `getMember()`, and `getOrAddMember()`
-* Remove undocumented `JsonDocument::data()` and `JsonDocument::memoryPool()`
-* Remove undocumented `JsonArrayIterator::internal()` and `JsonObjectIterator::internal()`
-* Rename things in `ARDUINOJSON_NAMESPACE` to match the public names
-* Add documentation to most public symbols
-* Remove support for naked `char` (was deprecated since 6.18.0)
+* Remove `JsonDocument::memoryUsage()`
+* Remove `JsonDocument::garbageCollect()`
+* Add `deserializeJson(JsonVariant, ...)` and `deserializeMsgPack(JsonVariant, ...)` (#1226)
+* Call `shrinkToFit()` in `deserializeJson()` and `deserializeMsgPack()`
+* `serializeJson()` and `serializeMsgPack()` replace the content of `std::string` and `String` instead of appending to it
+* Replace `add()` with `add<T>()` (`add(T)` is still supported)
+* Remove `createNestedArray()` and `createNestedObject()` (use `to<JsonArray>()` and `to<JsonObject>()` instead)
 
 > ### BREAKING CHANGES
 >
-> This release hides `JsonVariant`'s functions that were only intended for internal use.
-> If you were using them in your programs, you must replace with `operator[]` and `to<JsonVariant>()`, like so:
+> As every major release, ArduinoJson 7 introduces several breaking changes.
+> I added some stubs so that most existing programs should compile, but I highty recommend you upgrade your code.
+>
+> #### `JsonDocument`
+> 
+> In ArduinoJson 6, you could allocate the memory pool on the stack (with `StaticJsonDocument`) or in the heap (with `DynamicJsonDocument`).  
+> In ArduinoJson 7, the memory pool is always allocated in the heap, so `StaticJsonDocument` and `DynamicJsonDocument` have been merged into `JsonDocument`.
+>
+> In ArduinoJson 6, `JsonDocument` had a fixed capacity; in ArduinoJson 7, it has an elastic capacity that grows as needed.
+> Therefore, you don't need to specify the capacity anymore, so the macros `JSON_ARRAY_SIZE()`, `JSON_OBJECT_SIZE()`, and `JSON_STRING_SIZE()` have been removed.
 >
 > ```c++
-> // before
-> JsonVariant a = variant.getElement(idx);
-> JsonVariant b = variant.getOrAddElement(idx);
-> JsonVariant c = variant.getMember(key);
-> JsonVariant d = variant.getOrAddMember(key);
->
-> // after
-> JsonVariant a = variant[idx];
-> JsonVariant b = idx < variant.size() ? variant[idx] : variant[idx].to<JsonVariant>();
-> JsonVariant c = variant[key];
-> JsonVariant d = variant.containsKey(key) ? variant[key] : variant[key].to<JsonVariant>();
-> ```
-
-v6.19.4 (2022-04-05)
--------
-
-* Add `ElementProxy::memoryUsage()`
-* Add `MemberProxy::memoryUsage()` (issue #1730)
-* Add implicit conversion from `JsonDocument` to `JsonVariant`
-* Fix comparisons operators with `const JsonDocument&`
-
-v6.19.3 (2022-03-08)
--------
-
-* Fix `call of overloaded 'String(const char*, int)' is ambiguous`
-* Fix `JsonString` operator `==` and `!=` for non-zero-terminated string
-* Fix `-Wsign-conversion` on GCC 8 (issue #1715)
-* MessagePack: serialize round floats as integers (issue #1718)
-
-v6.19.2 (2022-02-14)
--------
-
-* Fix `cannot convert 'pgm_p' to 'const void*'` (issue #1707)
-
-v6.19.1 (2022-01-14)
--------
-
-* Fix crash when adding an object member in a too small `JsonDocument`
-* Fix filter not working in zero-copy mode (issue #1697)
-
-v6.19.0 (2022-01-08)
--------
-
-* Remove `ARDUINOJSON_EMBEDDED_MODE` and assume we run on an embedded platform.  
-  Dependent settings (like `ARDUINOJSON_DEFAULT_NESTING_LIMIT`) must be set individually.
-* Change the default of `ARDUINOJSON_USE_DOUBLE` to `1`
-* Change the default of `ARDUINOJSON_USE_LONG_LONG` to `1` on 32-bit platforms
-* Add `as<JsonString>()` and `is<JsonString>()`
-* Add safe bool idiom in `JsonString`
-* Add support for NUL in string values (issue #1646)
-* Add support for arbitrary array rank in `copyArray()`
-* Add support for `char[][]` in `copyArray()`
-* Remove `DeserializationError == bool` and `DeserializationError != bool`
-* Renamed undocumented function `isUndefined()` to `isUnbound()`
-* Fix `JsonVariant::memoryUsage()` for raw strings
-* Fix `call of overloaded 'swap(BasicJsonDocument&, BasicJsonDocument&)' is ambiguous` (issue #1678)
-* Fix inconsistent pool capacity between `BasicJsonDocument`'s copy and move constructors
-* Fix inconsistent pool capacity between `BasicJsonDocument`'s copy and move assignments
-* Fix return type of `StaticJsonDocument::operator=`
-* Avoid pool reallocation in `BasicJsonDocument`'s copy assignment if capacity is the same
-* Avoid including `Arduino.h` when all its features are disabled (issue #1692, PR #1693 by @paulocsanz)
-* Assume `PROGMEM` is available as soon as `ARDUINO` is defined (consequence of #1693)
-
-v6.18.5 (2021-09-28)
--------
-
-* Set `ARDUINOJSON_EMBEDDED_MODE` to `1` on Nios II (issue #1657)
-
-v6.18.4 (2021-09-06)
--------
-
-* Fixed error `'dummy' may be used uninitialized` on GCC 11
-* Fixed error `expected unqualified-id before 'const'` on GCC 11 (issue #1622)
-* Filter: exact match takes precedence over wildcard (issue #1628)
-* Fixed deserialization of `\u0000` (issue #1646)
-
-v6.18.3 (2021-07-27)
--------
-
-* Changed return type of `convertToJson()` and `Converter<T>::toJson()` to `void`
-* Added `as<std::string_view>()` and `is<std::string_view>()`
-
-v6.18.2 (2021-07-19)
--------
-
-* Removed a symlink because the Arduino Library Specification forbids it
-
-v6.18.1 (2021-07-03)
--------
-
-* Fixed support for `volatile float` and `volatile double` (issue #1557)
-* Fixed error `[Pe070]: incomplete type is not allowed` on IAR (issue #1560)
-* Fixed `serializeJson(doc, String)` when allocation fails (issue #1572)
-* Fixed clang-tidy warnings (issue #1574, PR #1577 by @armandas)
-* Added fake class `InvalidConversion<T1,T2>` to easily identify invalid conversions (issue #1585)
-* Added support for `std::string_view` (issue #1578, PR #1554 by @0xFEEDC0DE64)
-* Fixed warning `definition of implicit copy constructor for 'MsgPackDeserializer' is deprecated because it has a user-declared copy assignment operator`
-* Added `JsonArray::clear()` (issue #1597)
-* Fixed `JsonVariant::as<unsigned>()` (issue #1601)
-* Added support for ESP-IDF component build (PR #1562 by @qt1, PR #1599 by @andreaskuster)
-
-v6.18.0 (2021-05-05)
--------
-
-* Added support for custom converters (issue #687)
-* Added support for `Printable` (issue #1444)
-* Removed support for `char` values, see below (issue #1498)
-* `deserializeJson()` leaves `\uXXXX` unchanged instead of returning `NotSupported`
-* `deserializeMsgPack()` inserts `null` instead of returning `NotSupported`
-* Removed `DeserializationError::NotSupported`
-* Added `JsonVariant::is<JsonArrayConst/JsonObjectConst>()` (issue #1412)
-* Added `JsonVariant::is<JsonVariant/JsonVariantConst>()` (issue #1412)
-* Changed `JsonVariantConst::is<JsonArray/JsonObject>()` to return `false` (issue #1412)
-* Simplified `JsonVariant::as<T>()` to always return `T` (see below)
-* Updated folders list in `.mbedignore` (PR #1515 by @AGlass0fMilk)
-* Fixed member-call-on-null-pointer in `getMember()` when array is empty
-* `serializeMsgPack(doc, buffer, size)` doesn't add null-terminator anymore (issue #1545)
-* `serializeJson(doc, buffer, size)` adds null-terminator only if there is enough room
-* PlatformIO: set `build.libArchive` to `false` (PR #1550 by @askreet)
-
-> ### BREAKING CHANGES
->
-> #### Support for `char` removed
->
-> We cannot cast a `JsonVariant` to a `char` anymore, so the following will break:
-> ```c++
-> char age = doc["age"];  //  error: no matching function for call to 'variantAs(VariantData*&)'
-> ```
-> Instead, you must use another integral type, such as `int8_t`:
-> ```c++
-> int8_t age = doc["age"];  // OK
+> // ArduinoJson 6
+> StaticJsonDocument<256> doc;
+> // or
+> DynamicJsonDocument doc(256);
+> 
+> // ArduinoJson 7
+> JsonDocument doc;
 > ```
 >
-> Similarly, we cannot assign from a `char` anymore, so the following will break:
-> ```c++
-> char age;
-> doc["age"] = age;  // error: no matching function for call to 'VariantRef::set(const char&)'
-> ```
-> Instead, you must use another integral type, such as `int8_t`:
-> ```c++
-> int8_t age;
-> doc["age"] = age;  // OK
-> ```
-> A deprecation warning with the message "Support for `char` is deprecated, use `int8_t` or `uint8_t` instead" was added to allow a smooth transition.
+> In ArduinoJson 7, `JsonDocument` reuses released memory, so `garbageCollect()` has been removed.  
+> `shrinkToFit()` is still available and releases the over-allocated memory.
 >
-> #### `as<T>()` always returns `T`
+> Due to a change in the implementation, it's not possible to store a pointer to a variant from another `JsonDocument`, so `shallowCopy()` has been removed.
+> 
+> In ArduinoJson 6, the meaning of `memoryUsage()` was clear: it returned the number of bytes used in the memory pool.  
+> In ArduinoJson 7, the meaning of `memoryUsage()` would be ambiguous, so it has been removed.
 >
-> Previously, `JsonVariant::as<T>()` could return a type different from `T`.
-> The most common example is `as<char*>()` that returned a `const char*`.
-> While this feature simplified a few use cases, it was confusing and complicated the
-> implementation of custom converters.
+> #### Custom allocators
 >
-> Starting from this version, `as<T>` doesn't try to auto-correct the return type and always return `T`,
-> which means that you cannot write this anymore:
+> In ArduinoJson 6, you could specify a custom allocator class as a template parameter of `BasicJsonDocument`.  
+> In ArduinoJson 7, you must inherit from `ArduinoJson::Allocator` and pass a pointer to an instance of your class to the constructor of `JsonDocument`.
 >
 > ```c++
-> Serial.println(doc["sensor"].as<char*>());  // error: invalid conversion from 'const char*' to 'char*' [-fpermissive]
+> // ArduinoJson 6
+> class MyAllocator {
+>   // ...
+> };
+> BasicJsonDocument<MyAllocator> doc(256);
+>
+> // ArduinoJson 7
+> class MyAllocator : public ArduinoJson::Allocator {
+>   // ...
+> };
+> MyAllocator myAllocator;
+> JsonDocument doc(&myAllocator);
 > ```
-> 
-> Instead, you must write:
+>
+> #### `createNestedArray()` and `createNestedObject()`
+>
+> In ArduinoJson 6, you could create a nested array or object with `createNestedArray()` and `createNestedObject()`.  
+> In ArduinoJson 7, you must use `add<T>()` or `to<T>()` instead.
+>
+> For example, to create `[[],{}]`, you would write:
 >
 > ```c++
-> Serial.println(doc["sensor"].as<const char*>());  // OK
+> // ArduinoJson 6
+> arr.createNestedArray();
+> arr.createNestedObject();
+>
+> // ArduinoJson 7
+> arr.add<JsonArray>();
+> arr.add<JsonObject>();
 > ```
 >
-> A deprecation warning with the message "Replace `as<char*>()` with `as<const char*>()`" was added to allow a smooth transition.
->
-> #### `DeserializationError::NotSupported` removed
->
-> On a different topic, `DeserializationError::NotSupported` has been removed.
-> Instead of returning this error:
->
-> * `deserializeJson()` leaves `\uXXXX` unchanged (only when `ARDUINOJSON_DECODE_UNICODE` is `0`)
-> * `deserializeMsgPack()` replaces unsupported values with `null`s
->
-> #### Const-aware `is<T>()`
->
-> Lastly, a very minor change concerns `JsonVariantConst::is<T>()`.
-> It used to return `true` for `JsonArray` and `JsonOject`, but now it returns `false`.
-> Instead, you must use `JsonArrayConst` and `JsonObjectConst`.
-
-v6.17.3 (2021-02-15)
--------
-
-* Made `JsonDocument`'s destructor protected (issue #1480)
-* Added missing calls to `client.stop()` in `JsonHttpClient.ino` (issue #1485)
-* Fixed error `expected ')' before 'char'` when `isdigit()` is a macro (issue #1487)
-* Fixed error `definition of implicit copy constructor is deprecated` on Clang 10
-* PlatformIO: set framework compatibility to `*` (PR #1490 by @maxgerhardt)
-
-v6.17.2 (2020-11-14)
--------
-
-* Fixed invalid conversion error in `operator|(JsonVariant, char*)` (issue #1432)
-* Changed the default value of `ARDUINOJSON_ENABLE_PROGMEM` (issue #1433).
-  It now checks that the `pgm_read_XXX` macros are defined before enabling `PROGMEM`.
-
-v6.17.1 (2020-11-07)
--------
-
-* Fixed error `ambiguous overload for 'operator|'` (issue #1411)
-* Fixed `operator|(MemberProxy, JsonObject)` (issue #1415)
-* Allowed more than 32767 values in non-embedded mode (issue #1414)
-
-v6.17.0 (2020-10-19)
--------
-
-* Added a build failure when nullptr is defined as a macro (issue #1355)
-* Added `JsonDocument::overflowed()` which tells if the memory pool was too small (issue #1358)
-* Added `DeserializationError::EmptyInput` which tells if the input was empty
-* Added `DeserializationError::f_str()` which returns a `const __FlashStringHelper*` (issue #846)
-* Added `operator|(JsonVariantConst, JsonVariantConst)`
-* Added filtering for MessagePack (issue #1298, PR #1394 by Luca Passarella)
-* Moved float convertion tables to PROGMEM
-* Fixed `JsonVariant::set((char*)0)` which returned false instead of true (issue #1368)
-* Fixed error `No such file or directory #include <WString.h>` (issue #1381)
-
-v6.16.1 (2020-08-04)
--------
-
-* Fixed `deserializeJson()` that stopped reading after `{}` (issue #1335)
-
-v6.16.0 (2020-08-01)
--------
-
-* Added comparisons (`>`, `>=`, `==`, `!=`, `<`, and `<=`) between `JsonVariant`s
-* Added string deduplication (issue #1303)
-* Added `JsonString::operator!=`
-* Added wildcard key (`*`) for filters (issue #1309)
-* Set `ARDUINOJSON_DECODE_UNICODE` to `1` by default
-* Fixed `copyArray()` not working with `String`, `ElementProxy`, and `MemberProxy`
-* Fixed error `getOrAddElement is not a member of ElementProxy` (issue #1311)
-* Fixed excessive stack usage when compiled with `-Og` (issues #1210 and #1314)
-* Fixed `Warning[Pa093]: implicit conversion from floating point to integer` on IAR compiler (PR #1328 by @stawiski)
-
-v6.15.2 (2020-05-15)
--------
-
-* CMake: don't build tests when imported in another project
-* CMake: made project arch-independent
-* Visual Studio: fixed error C2766 with flag `/Zc:__cplusplus` (issue #1250)
-* Added support for `JsonDocument` to `copyArray()` (issue #1255)
-* Added support for `enum`s in `as<T>()` and `is<T>()`  (issue #1256)
-* Added `JsonVariant` as an input type for `deserializeXxx()`  
-  For example, you can do: `deserializeJson(doc2, doc1["payload"])`
-* Break the build if using 64-bit integers with ARDUINOJSON_USE_LONG_LONG==0
-
-v6.15.1 (2020-04-08)
--------
-
-* Fixed "maybe-uninitialized" warning (issue #1217)
-* Fixed "statement is unreachable" warning on IAR (issue #1233)
-* Fixed "pointless integer comparison" warning on IAR (issue #1233)
-* Added CMake "install" target (issue #1209)
-* Disabled alignment on AVR (issue #1231)
-
-v6.15.0 (2020-03-22)
--------
-
-* Added `DeserializationOption::Filter` (issue #959)
-* Added example `JsonFilterExample.ino`
-* Changed the array subscript operator to automatically add missing elements
-* Fixed "deprecated-copy" warning on GCC 9 (fixes #1184)
-* Fixed `MemberProxy::set(char[])` not duplicating the string (issue #1191)
-* Fixed enums serialized as booleans (issue #1197)
-* Fixed incorrect string comparison on some platforms (issue #1198)
-* Added move-constructor and move-assignment to `BasicJsonDocument`
-* Added `BasicJsonDocument::garbageCollect()` (issue #1195)
-* Added `StaticJsonDocument::garbageCollect()`
-* Changed copy-constructor of `BasicJsonDocument` to preserve the capacity of the source.
-* Removed copy-constructor of `JsonDocument` (issue #1189)
-
-> ### BREAKING CHANGES
-> 
-> #### Copy-constructor of `BasicJsonDocument`
->
-> In previous versions, the copy constructor of `BasicJsonDocument` looked at the source's `memoryUsage()` to choose its capacity.
-> Now, the copy constructor of `BasicJsonDocument` uses the same capacity as the source.
->
-> Example:
+> And to create `{"array":[],"object":{}}`, you would write:
 >
 > ```c++
-> DynamicJsonDocument doc1(64);
-> doc1.set(String("example"));
+> // ArduinoJson 6
+> obj.createNestedArray("array");
+> obj.createNestedObject("object");
 >
-> DynamicJsonDocument doc2 = doc1;
-> Serial.print(doc2.capacity());  // 8 with ArduinoJson 6.14
->                                 // 64 with ArduinoJson 6.15
-> ```
->
-> I made this change to get consistent results between copy-constructor and move-constructor, and whether RVO applies or not.
->
-> If you use the copy-constructor to optimize your documents, you can use `garbageCollect()` or `shrinkToFit()` instead.
->
-> #### Copy-constructor of `JsonDocument`
->
-> In previous versions, it was possible to create a function that take a `JsonDocument` by value.
->
-> ```c++
-> void myFunction(JsonDocument doc) {}
-> ```
->
-> This function gives the wrong clues because it doesn't receive a copy of the `JsonDocument`, only a sliced version.
-> It worked because the copy constructor copied the internal pointers, but it was an accident.
->
-> From now, if you need to pass a `JsonDocument` to a function, you must use a reference:
->
-> ```c++
-> void myFunction(JsonDocument& doc) {}
-> ```
-
-v6.14.1 (2020-01-27)
--------
-
-* Fixed regression in UTF16 decoding (issue #1173)
-* Fixed `containsKey()` on `JsonVariantConst`
-* Added `getElement()` and `getMember()` to `JsonVariantConst`
-
-v6.14.0 (2020-01-16)
--------
-
-* Added `BasicJsonDocument::shrinkToFit()`
-* Added support of `uint8_t` for `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` (issue #1142)
-* Added `ARDUINOJSON_ENABLE_COMMENTS` to enable support for comments (defaults to 0)
-* Auto enable support for `std::string` and `std::stream` on modern compilers (issue #1156)
-  (No need to define `ARDUINOJSON_ENABLE_STD_STRING` and `ARDUINOJSON_ENABLE_STD_STREAM` anymore)
-* Improved decoding of UTF-16 surrogate pairs (PR #1157 by @kaysievers)
-  (ArduinoJson now produces standard UTF-8 instead of CESU-8)
-* Added `measureJson`, `measureJsonPretty`, and `measureMsgPack` to `keywords.txt`
-  (This file is used for syntax highlighting in the Arduino IDE) 
-* Fixed `variant.is<nullptr_t>()`
-* Fixed value returned by `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` when writing to a `String`
-* Improved speed of `serializeJson()`, `serializeJsonPretty()`, and `serializeMsgPack()` when writing to a `String`
-
-> ### BREAKING CHANGES
-> 
-> #### Comments
-> 
-> Support for comments in input is now optional and disabled by default.
->
-> If you need support for comments, you must defined `ARDUINOJSON_ENABLE_COMMENTS` to `1`; otherwise, you'll receive `InvalidInput` errors.
->
-> ```c++
-> #define ARDUINOJSON_ENABLE_COMMENTS 1
-> #include <ArduinoJson.h>
-> ```
-
-v6.13.0 (2019-11-01)
--------
-
-* Added support for custom writer/reader classes (issue #1088)
-* Added conversion from `JsonArray` and `JsonObject` to `bool`, to be consistent with `JsonVariant`
-* Fixed `deserializeJson()` when input contains duplicate keys (issue #1095)
-* Improved `deserializeMsgPack()` speed by reading several bytes at once
-* Added detection of Atmel AVR8/GNU C Compiler (issue #1112)
-* Fixed deserializer that stopped reading at the first `0xFF` (PR #1118 by @mikee47)
-* Fixed dangling reference in copies of `MemberProxy` and `ElementProxy` (issue #1120)
-
-v6.12.0 (2019-09-05)
--------
-
-* Use absolute instead of relative includes (issue #1072)
-* Changed `JsonVariant::as<bool>()` to return `true` for any non-null value (issue #1005)
-* Moved ancillary files to `extras/` (issue #1011)
-
-v6.11.5 (2019-08-23)
--------
-
-* Added fallback implementations of `strlen_P()`, `strncmp_P()`, `strcmp_P()`, and `memcpy_P()` (issue #1073)
-
-v6.11.4 (2019-08-12)
--------
-
-* Added `measureJson()` to the `ArduinoJson` namespace (PR #1069 by @nomis)
-* Added support for `basic_string<char, traits, allocator>` (issue #1045)
-* Fixed example `JsonConfigFile.ino` for ESP8266
-* Include `Arduino.h` if `ARDUINO` is defined (PR #1071 by @nomis)
-
-v6.11.3 (2019-07-22)
--------
-
-* Added operators `==` and `!=` for `JsonDocument`, `ElementProxy`, and `MemberProxy`
-* Fixed comparison of `JsonVariant` when one contains a linked string and the other contains an owned string (issue #1051)
-
-v6.11.2 (2019-07-08)
--------
-
-* Fixed assignment of `JsonDocument` to `JsonVariant` (issue #1023)
-* Fix invalid conversion error on Particle Argon (issue #1035)
-
-v6.11.1 (2019-06-21)
--------
-
-* Fixed `serialized()` not working with Flash strings (issue #1030)
-
-v6.11.0 (2019-05-26)
--------
-
-* Fixed `deserializeJson()` silently accepting a `Stream*` (issue #978)
-* Fixed invalid result from `operator|` (issue #981)
-* Made `deserializeJson()` more picky about trailing characters (issue #980)
-* Added `ARDUINOJSON_ENABLE_NAN` (default=0) to enable NaN in JSON (issue #973)
-* Added `ARDUINOJSON_ENABLE_INFINITY` (default=0) to enable Infinity in JSON
-* Removed implicit conversion in comparison operators (issue #998)
-* Added lexicographical comparison for `JsonVariant`
-* Added support for `nullptr` (issue #998)
-
-> ### BREAKING CHANGES
-> 
-> #### NaN and Infinity
-> 
-> The JSON specification allows neither NaN not Infinity, but previous
-> versions of ArduinoJson supported it. Now, ArduinoJson behaves like most
-> other libraries: a NaN or and Infinity in the `JsonDocument`, becomes
-> a `null` in the output JSON. Also, `deserializeJson()` returns
-> `InvalidInput` if the JSON document contains NaN or Infinity.
-> 
-> This version still supports NaN and Infinity in JSON documents, but
-> it's disabled by default to be compatible with other JSON parsers.
-> If you need the old behavior back, define `ARDUINOJSON_ENABLE_NAN` and
-> `ARDUINOJSON_ENABLE_INFINITY` to `1`;:
-> 
-> ```c++
-> #define ARDUINOJSON_ENABLE_NAN 1
-> #define ARDUINOJSON_ENABLE_INFINITY 1
-> #include <ArduinoJson.h>
-> ```
-> 
-> #### The "or" operator
-> 
-> This version slightly changes the behavior of the | operator when the 
-> variant contains a float and the user requests an integer.
->
-> Older versions returned the floating point value truncated.
-> Now, it returns the default value.
-> 
-> ```c++
-> // suppose variant contains 1.2
-> int value = variant | 3;
-> 
-> // old behavior:
-> value == 1
-> 
-> // new behavior
-> value == 3
-> ```
-> 
-> If you need the old behavior, you must add `if (variant.is<float>())`.
-
-v6.10.1 (2019-04-23)
--------
-
-* Fixed error "attributes are not allowed on a function-definition"
-* Fixed `deserializeJson()` not being picky enough (issue #969)
-* Fixed error "no matching function for call to write(uint8_t)" (issue #972)
-
-v6.10.0 (2019-03-22)
--------
-
-* Fixed an integer overflow in the JSON deserializer
-* Added overflow handling in `JsonVariant::as<T>()` and `JsonVariant::is<T>()`.
-   - `as<T>()` returns `0` if the integer `T` overflows
-   - `is<T>()` returns `false` if the integer `T` overflows
-* Added `BasicJsonDocument` to support custom allocator (issue #876)
-* Added `JsonDocument::containsKey()` (issue #938)
-* Added `JsonVariant::containsKey()`
-
-v6.9.1 (2019-03-01)
-------
-
-* Fixed warning "unused variable" with GCC 4.4 (issue #912)
-* Fixed warning "cast  increases required alignment" (issue #914)
-* Fixed warning "conversion may alter value" (issue #914)
-* Fixed naming conflict with "CAPACITY" (issue #839)
-* Muted warning "will change in GCC 7.1" (issue #914)
-* Added a clear error message for `StaticJsonBuffer` and `DynamicJsonBuffer`
-* Marked ArduinoJson.h  as a "system header"
-
-v6.9.0 (2019-02-26)
-------
-
-* Decode escaped Unicode characters like \u00DE (issue #304, PR #791)
-  Many thanks to Daniel Schulte (aka @trilader) who implemented this feature.
-* Added option ARDUINOJSON_DECODE_UNICODE to enable it
-* Converted `JsonArray::copyFrom()/copyTo()` to free functions `copyArray()`
-* Renamed `JsonArray::copyFrom()` and `JsonObject::copyFrom()` to `set()`
-* Renamed `JsonArray::get()` to `getElement()`
-* Renamed `JsonArray::add()` (without arg) to `addElement()`
-* Renamed `JsonObject::get()` to `getMember()`
-* Renamed `JsonObject::getOrCreate()` to `getOrAddMember()`
-* Fixed `JsonVariant::isNull()` not returning `true` after `set((char*)0)`
-* Fixed segfault after `variant.set(serialized((char*)0))`
-* Detect `IncompleteInput` in `false`, `true`, and `null`
-* Added `JsonDocument::size()`
-* Added `JsonDocument::remove()`
-* Added `JsonVariant::clear()`
-* Added `JsonVariant::remove()`
-
-v6.8.0-beta (2019-01-30)
------------
-
-* Import functions in the ArduinoJson namespace to get clearer errors
-* Improved syntax highlighting in Arduino IDE
-* Removed default capacity of `DynamicJsonDocument`
-* `JsonArray::copyFrom()` accepts `JsonArrayConst`
-* `JsonVariant::set()` accepts `JsonArrayConst` and `JsonObjectConst`
-* `JsonDocument` was missing in the ArduinoJson namespace
-* Added `memoryUsage()` to `JsonArray`, `JsonObject`, and `JsonVariant`
-* Added `nesting()` to `JsonArray`, `JsonDocument`, `JsonObject`, and `JsonVariant`
-* Replaced `JsonDocument::nestingLimit` with an additional parameter
-  to `deserializeJson()` and `deserializeMsgPack()`
-* Fixed uninitialized variant in `JsonDocument`
-* Fixed `StaticJsonDocument` copy constructor and copy assignment
-* The copy constructor of `DynamicJsonDocument` chooses the capacity according to the memory usage of the source, not from the capacity of the source.
-* Added the ability to create/assign a `StaticJsonDocument`/`DynamicJsonDocument` from a `JsonArray`/`JsonObject`/`JsonVariant`
-* Added `JsonDocument::isNull()`
-* Added `JsonDocument::operator[]`
-* Added `ARDUINOJSON_TAB` to configure the indentation character
-* Reduced the size of the pretty JSON serializer
-* Added `add()`, `createNestedArray()` and `createNestedObject()` to `JsonVariant`
-* `JsonVariant` automatically promotes to `JsonObject` or `JsonArray` on write.
-  Calling `JsonVariant::to<T>()` is not required anymore.
-* `JsonDocument` now support the same operations as `JsonVariant`.
-  Calling `JsonDocument::as<T>()` is not required anymore.
-* Fixed example `JsonHttpClient.ino`
-* User can now use a `JsonString` as a key or a value
-
-> ### BREAKING CHANGES
-> 
-> #### `DynamicJsonDocument`'s constructor
-> 
-> The parameter to the constructor of `DynamicJsonDocument` is now mandatory
->
-> Old code:
->
-> ```c++
-> DynamicJsonDocument doc;
-> ```
->
-> New code:
->
-> ```c++
-> DynamicJsonDocument doc(1024);
-> ```
-> 
-> #### Nesting limit
-> 
-> `JsonDocument::nestingLimit` was replaced with a new parameter to `deserializeJson()` and `deserializeMsgPack()`.
-> 
-> Old code:
-> 
-> ```c++
-> doc.nestingLimit = 15;
-> deserializeJson(doc, input);
-> ```
-> 
-> New code: 
-> 
-> ```c++
-> deserializeJson(doc, input, DeserializationOption::NestingLimit(15));
-> ```
-
-v6.7.0-beta (2018-12-07)
------------
-
-* Removed the automatic expansion of `DynamicJsonDocument`, it now has a fixed capacity.
-* Restored the monotonic allocator because the code was getting too big
-* Reduced the memory usage
-* Reduced the code size
-* Renamed `JsonKey` to `JsonString`
-* Removed spurious files in the Particle library
-
-v6.6.0-beta (2018-11-13)
------------
-
-* Removed `JsonArray::is<T>(i)` and `JsonArray::set(i,v)`
-* Removed `JsonObject::is<T>(k)` and `JsonObject::set(k,v)`
-* Replaced `T JsonArray::get<T>(i)` with `JsonVariant JsonArray::get(i)`
-* Replaced `T JsonObject::get<T>(k)` with `JsonVariant JsonObject::get(k)`
-* Added `JSON_STRING_SIZE()`
-* ~~Replacing or removing a value now releases the memory~~
-* Added `DeserializationError::code()` to be used in switch statements (issue #846)
-
-v6.5.0-beta (2018-10-13)
------------
-
-* Added implicit conversion from `JsonArray` and `JsonObject` to `JsonVariant`
-* Allow mixed configuration in compilation units (issue #809)
-* Fixed object keys not being duplicated
-* `JsonPair::key()` now returns a `JsonKey`
-* Increased the default capacity of `DynamicJsonDocument`
-* Fixed `JsonVariant::is<String>()` (closes #763)
-* Added `JsonArrayConst`, `JsonObjectConst`, and `JsonVariantConst`
-* Added copy-constructor and copy-assignment-operator for `JsonDocument` (issue #827)
-
-v6.4.0-beta (2018-09-11)
------------
-
-* Copy `JsonArray` and `JsonObject`, instead of storing pointers (issue #780)
-* Added `JsonVariant::to<JsonArray>()` and `JsonVariant::to<JsonObject>()`
-
-v6.3.0-beta (2018-08-31)
------------
-
-* Implemented reference semantics for `JsonVariant`
-* Replaced `JsonPair`'s `key` and `value` with `key()` and `value()`
-* Fixed `serializeJson(obj[key], dst)` (issue #794)
-
-> ### BREAKING CHANGES
->
-> #### JsonVariant
-> 
-> `JsonVariant` now has a semantic similar to `JsonObject` and `JsonArray`.
-> It's a reference to a value stored in the `JsonDocument`.
-> As a consequence, a `JsonVariant` cannot be used as a standalone variable anymore.
->
-> Old code:
->
-> ```c++
-> JsonVariant myValue = 42;
-> ```
->
-> New code:
->
-> ```c++
-> DynamicJsonDocument doc;
-> JsonVariant myValue = doc.to<JsonVariant>();
-> myValue.set(42);
-> ```
->
-> #### JsonPair
->
-> Old code:
->
-> ```c++
-> for(JsonPair p : myObject) {
->   Serial.println(p.key);
->   Serial.println(p.value.as<int>());
-> }
-> ```
->
-> New code:
->
-> ```c++
-> for(JsonPair p : myObject) {
->   Serial.println(p.key());
->   Serial.println(p.value().as<int>());
-> }
-> ```
->
-> CAUTION: the key is now read only!
-
-v6.2.3-beta (2018-07-19)
------------
-
-* Fixed exception when using Flash strings as object keys (issue #784)
-
-v6.2.2-beta (2018-07-18)
------------
-
-* Fixed `invalid application of 'sizeof' to incomplete type '__FlashStringHelper'` (issue #783)
-* Fixed `char[]` not duplicated when passed to `JsonVariant::operator[]`
-
-v6.2.1-beta (2018-07-17)
------------
-
-* Fixed `JsonObject` not inserting keys of type `String` (issue #782)
-
-v6.2.0-beta (2018-07-12)
------------
-
-* Disabled lazy number deserialization (issue #772)
-* Fixed `JsonVariant::is<int>()` that returned true for empty strings
-* Improved float serialization when `-fsingle-precision-constant` is used
-* Renamed function `RawJson()` to `serialized()`
-* `serializeMsgPack()` now supports values marked with `serialized()`
-
-> ### BREAKING CHANGES
->
-> #### Non quoted strings
->
-> Non quoted strings are now forbidden in values, but they are still allowed in keys.
-> For example, `{key:"value"}` is accepted, but `{key:value}` is not.
->
-> #### Preformatted values
->
-> Old code:
->
-> ```c++
-> object["values"] = RawJson("[1,2,3,4]");
-> ```
-> 
-> New code:
-> 
-> ```c++
-> object["values"] = serialized("[1,2,3,4]");
-> ```
-
-v6.1.0-beta (2018-07-02)
------------
-
-* Return `JsonArray` and `JsonObject` by value instead of reference (issue #309)
-* Replaced `success()` with `isNull()`
-
-> ### BREAKING CHANGES
-> 
-> Old code:
->
-> ```c++
-> JsonObject& obj = doc.to<JsonObject>();
-> JsonArray& arr = obj.createNestedArray("key");
-> if (!arr.success()) {
->   Serial.println("Not enough memory");
->   return;
-> }
-> ```
-> 
-> New code:
-> 
-> ```c++
-> JsonObject obj = doc.to<JsonObject>();
-> JsonArray arr = obj.createNestedArray("key");
-> if (arr.isNull()) {
->   Serial.println("Not enough memory");
->   return;
-> }
-> ```
-
-v6.0.1-beta (2018-06-11)
------------
-
-* Fixed conflicts with `isnan()` and `isinf()` macros (issue #752)
-
-v6.0.0-beta (2018-06-07)
------------
-
-* Added `DynamicJsonDocument` and `StaticJsonDocument`
-* Added `deserializeJson()`
-* Added `serializeJson()` and `serializeJsonPretty()`
-* Added `measureJson()` and `measureJsonPretty()`
-* Added `serializeMsgPack()`, `deserializeMsgPack()` and `measureMsgPack()` (issue #358)
-* Added example `MsgPackParser.ino` (issue #358)
-* Added support for non zero-terminated strings (issue #704)
-* Removed `JsonBuffer::parseArray()`, `parseObject()` and `parse()`
-* Removed `JsonBuffer::createArray()` and `createObject()`
-* Removed `printTo()` and `prettyPrintTo()`
-* Removed `measureLength()` and `measurePrettyLength()`
-* Removed all deprecated features
-
-> ### BREAKING CHANGES
-> 
-> #### Deserialization
-> 
-> Old code:
-> 
-> ```c++
-> DynamicJsonBuffer jb;
-> JsonObject& obj = jb.parseObject(json);
-> if (obj.success()) {
-> 
-> }
-> ```
-> 
-> New code:
-> 
-> ```c++
-> DynamicJsonDocument doc;
-> DeserializationError error = deserializeJson(doc, json);
-> if (error) {
-> 
-> }
-> JsonObject& obj = doc.as<JsonObject>();
-> ```
-> 
-> #### Serialization
-> 
-> Old code:
-> 
-> ```c++
-> DynamicJsonBuffer jb;
-> JsonObject& obj = jb.createObject();
-> obj["key"] = "value";
-> obj.printTo(Serial);
-> ```
-> 
-> New code:
-> 
-> ```c++
-> DynamicJsonDocument obj;
-> JsonObject& obj = doc.to<JsonObject>();
-> obj["key"] = "value";
-> serializeJson(doc, Serial);
+> // ArduinoJson 7
+> obj["array"].to<JsonArray>();
+> obj["object"].to<JsonObject>();
 > ```
diff --git a/lib/ArduinoJson/CMakeLists.txt b/lib/ArduinoJson/CMakeLists.txt
new file mode 100644
index 000000000..6efa04b3b
--- /dev/null
+++ b/lib/ArduinoJson/CMakeLists.txt
@@ -0,0 +1,25 @@
+# ArduinoJson - https://arduinojson.org
+# Copyright © 2014-2024, Benoit BLANCHON
+# MIT License
+
+cmake_minimum_required(VERSION 3.15)
+
+if(ESP_PLATFORM)
+	# Build ArduinoJson as an ESP-IDF component
+	idf_component_register(INCLUDE_DIRS src)
+	return()
+endif()
+
+project(ArduinoJson VERSION 7.0.2)
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+	include(CTest)
+endif()
+
+add_subdirectory(src)
+
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+	include(extras/CompileOptions.cmake)
+	add_subdirectory(extras/tests)
+	add_subdirectory(extras/fuzzing)
+endif()
diff --git a/lib/ArduinoJson/LICENSE.txt b/lib/ArduinoJson/LICENSE.txt
index 15f1b9fbb..56bb92b7f 100644
--- a/lib/ArduinoJson/LICENSE.txt
+++ b/lib/ArduinoJson/LICENSE.txt
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 ---------------------
 
-Copyright © 2014-2023, Benoit BLANCHON
+Copyright © 2014-2024, Benoit BLANCHON
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
diff --git a/lib/ArduinoJson/README.md b/lib/ArduinoJson/README.md
deleted file mode 100644
index 16d93a3a6..000000000
--- a/lib/ArduinoJson/README.md
+++ /dev/null
@@ -1,161 +0,0 @@
-<p align="center">
-  <a href="https://arduinojson.org/"><img alt="ArduinoJson" src="https://arduinojson.org/images/logo.svg" width="200" /></a>
-</p>
-
----
-
-[![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/bblanchon/ArduinoJson/ci.yml?branch=6.x&logo=github)](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22+branch%3A6.x)
-[![Continuous Integration](https://ci.appveyor.com/api/projects/status/m7s53wav1l0abssg/branch/6.x?svg=true)](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
-[![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/arduinojson.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
-[![Coveralls branch](https://img.shields.io/coveralls/github/bblanchon/ArduinoJson/6.x?logo=coveralls)](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)  
-[![Arduino Library Manager](https://img.shields.io/static/v1?label=Arduino&message=v6.21.3&logo=arduino&logoColor=white&color=blue)](https://www.ardu-badge.com/ArduinoJson/6.21.3)
-[![PlatformIO Registry](https://badges.registry.platformio.org/packages/bblanchon/library/ArduinoJson.svg?version=6.21.3)](https://registry.platformio.org/packages/libraries/bblanchon/ArduinoJson?version=6.21.3) 
-[![ESP IDF](https://img.shields.io/static/v1?label=ESP+IDF&message=v6.21.3&logo=cpu&logoColor=white&color=blue)](https://components.espressif.com/components/bblanchon/arduinojson)  
-[![GitHub stars](https://img.shields.io/github/stars/bblanchon/ArduinoJson?style=flat&logo=github&color=orange)](https://github.com/bblanchon/ArduinoJson/stargazers)
-[![GitHub Sponsors](https://img.shields.io/github/sponsors/bblanchon?logo=github&color=orange)](https://github.com/sponsors/bblanchon)
-
-ArduinoJson is a C++ JSON library for Arduino and IoT (Internet Of Things).
-
-## Features
-
-* [JSON deserialization](https://arduinojson.org/v6/api/json/deserializejson/)
-    * [Optionally decodes UTF-16 escape sequences to UTF-8](https://arduinojson.org/v6/api/config/decode_unicode/)
-    * [Optionally stores links to the input buffer (zero-copy)](https://arduinojson.org/v6/api/json/deserializejson/)
-    * [Optionally supports comments in the input](https://arduinojson.org/v6/api/config/enable_comments/)
-    * [Optionally filters the input to keep only desired values](https://arduinojson.org/v6/api/json/deserializejson/#filtering)
-    * Supports single quotes as a string delimiter
-    * Compatible with [NDJSON](http://ndjson.org/) and [JSON Lines](https://jsonlines.org/)
-* [JSON serialization](https://arduinojson.org/v6/api/json/serializejson/)
-    * [Can write to a buffer or a stream](https://arduinojson.org/v6/api/json/serializejson/)
-    * [Optionally indents the document (prettified JSON)](https://arduinojson.org/v6/api/json/serializejsonpretty/)
-* [MessagePack serialization](https://arduinojson.org/v6/api/msgpack/serializemsgpack/)
-* [MessagePack deserialization](https://arduinojson.org/v6/api/msgpack/deserializemsgpack/)
-* Efficient
-    * [Twice smaller than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
-    * [Almost 10% faster than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
-    * [Consumes roughly 10% less RAM than the "official" Arduino_JSON library](https://arduinojson.org/2019/11/19/arduinojson-vs-arduino_json/)
-    * [Fixed memory allocation, no heap fragmentation](https://arduinojson.org/v6/api/jsondocument/)
-    * [Optionally works without heap memory (zero malloc)](https://arduinojson.org/v6/api/staticjsondocument/)
-    * [Deduplicates strings](https://arduinojson.org/news/2020/08/01/version-6-16-0/)
-* Versatile
-    * Supports [custom allocators (to use external RAM chip, for example)](https://arduinojson.org/v6/how-to/use-external-ram-on-esp32/)
-    * Supports [`String`](https://arduinojson.org/v6/api/config/enable_arduino_string/), [`std::string`](https://arduinojson.org/v6/api/config/enable_std_string/), and [`std::string_view`](https://arduinojson.org/v6/api/config/enable_string_view/)
-    * Supports [`Stream`](https://arduinojson.org/v6/api/config/enable_arduino_stream/) and [`std::istream`/`std::ostream`](https://arduinojson.org/v6/api/config/enable_std_stream/)
-    * Supports [Flash strings](https://arduinojson.org/v6/api/config/enable_progmem/)
-    * Supports [custom readers](https://arduinojson.org/v6/api/json/deserializejson/#custom-reader) and [custom writers](https://arduinojson.org/v6/api/json/serializejson/#custom-writer)
-    * Supports [custom converters](https://arduinojson.org/news/2021/05/04/version-6-18-0/)
-* Portable
-    * Usable on any C++ project (not limited to Arduino)
-    * Compatible with C++11, C++14 and C++17
-    * Support for C++98/C++03 available on [ArduinoJson 6.20.x](https://github.com/bblanchon/ArduinoJson/tree/6.20.x)
-    * Zero warnings with `-Wall -Wextra -pedantic` and `/W4`
-    * [Header-only library](https://en.wikipedia.org/wiki/Header-only)
-    * Works with virtually any board
-        * Arduino boards: [Uno](https://amzn.to/38aL2ik), [Due](https://amzn.to/36YkWi2), [Micro](https://amzn.to/35WkdwG), [Nano](https://amzn.to/2QTvwRX), [Mega](https://amzn.to/36XWhuf), [Yun](https://amzn.to/30odURc), [Leonardo](https://amzn.to/36XWjlR)...
-        * Espressif chips: [ESP8266](https://amzn.to/36YluV8), [ESP32](https://amzn.to/2G4pRCB)
-        * Lolin (WeMos) boards: [D1 mini](https://amzn.to/2QUpz7q), [D1 Mini Pro](https://amzn.to/36UsGSs)...
-        * Teensy boards: [4.0](https://amzn.to/30ljXGq), [3.2](https://amzn.to/2FT0EuC), [2.0](https://amzn.to/2QXUMXj)
-        * Particle boards: [Argon](https://amzn.to/2FQHa9X), [Boron](https://amzn.to/36WgLUd), [Electron](https://amzn.to/30vEc4k), [Photon](https://amzn.to/387F9Cd)...
-        * Texas Instruments boards: [MSP430](https://amzn.to/30nJWgg)...
-        * Soft cores: [Nios II](https://en.wikipedia.org/wiki/Nios_II)...
-    * Tested on all major development environments
-        * [Arduino IDE](https://www.arduino.cc/en/Main/Software)
-        * [Atmel Studio](http://www.atmel.com/microsite/atmel-studio/)
-        * [Atollic TrueSTUDIO](https://atollic.com/truestudio/)
-        * [Energia](http://energia.nu/)
-        * [IAR Embedded Workbench](https://www.iar.com/iar-embedded-workbench/)
-        * [Keil uVision](http://www.keil.com/)
-        * [MPLAB X IDE](http://www.microchip.com/mplab/mplab-x-ide)
-        * [Particle](https://www.particle.io/)
-        * [PlatformIO](http://platformio.org/)
-        * [Sloeber plugin for Eclipse](https://eclipse.baeyens.it/)
-        * [Visual Micro](http://www.visualmicro.com/)
-        * [Visual Studio](https://www.visualstudio.com/)
-    * [Even works with online compilers like wandbox.org](https://wandbox.org/permlink/RlZSKy17DjJ6HcdN)
-    * [CMake friendly](https://arduinojson.org/v6/how-to/use-arduinojson-with-cmake/)
-* Well designed
-    * [Elegant API](http://arduinojson.org/v6/example/)
-    * [Thread-safe](https://en.wikipedia.org/wiki/Thread_safety)
-    * Self-contained (no external dependency)
-    * `const` friendly
-    * [`for` friendly](https://arduinojson.org/v6/api/jsonobject/begin_end/)
-    * [TMP friendly](https://en.wikipedia.org/wiki/Template_metaprogramming)
-    * Handles [integer overflows](https://arduinojson.org/v6/api/jsonvariant/as/#integer-overflows)
-* Well tested
-    * [Unit test coverage close to 100%](https://coveralls.io/github/bblanchon/ArduinoJson?branch=6.x)
-    * Continuously tested on
-        * [Visual Studio 2017, 2019, 2022](https://ci.appveyor.com/project/bblanchon/arduinojson/branch/6.x)
-        * [GCC 5, 6, 7, 8, 9, 10, 11](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
-        * [Clang 3.8, 3.9, 4.0, 5.0, 6.0, 7, 8, 9, 10](https://github.com/bblanchon/ArduinoJson/actions?query=workflow%3A%22Continuous+Integration%22)
-    * [Continuously fuzzed with Google OSS Fuzz](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:arduinojson)
-    * Passes all default checks of [clang-tidy](https://releases.llvm.org/10.0.0/tools/clang/tools/extra/docs/clang-tidy/)
-* Well documented
-    * [Tutorials](https://arduinojson.org/v6/doc/deserialization/)
-    * [Examples](https://arduinojson.org/v6/example/)
-    * [How-tos](https://arduinojson.org/v6/example/)
-    * [FAQ](https://arduinojson.org/v6/faq/)
-    * [Troubleshooter](https://arduinojson.org/v6/troubleshooter/)
-    * [Book](https://arduinojson.org/book/)
-    * [Changelog](CHANGELOG.md)
-* Vibrant user community
-    * Most popular of all Arduino libraries on [GitHub](https://github.com/search?o=desc&q=arduino+library&s=stars&type=Repositories)
-    * [Used in hundreds of projects](https://www.hackster.io/search?i=projects&q=arduinojson)
-    * [Responsive support](https://github.com/bblanchon/ArduinoJson/issues?q=is%3Aissue+is%3Aclosed)
-
-## Quickstart
-
-### Deserialization
-
-Here is a program that parses a JSON document with ArduinoJson.
-
-```c++
-char json[] = "{\"sensor\":\"gps\",\"time\":1351824120,\"data\":[48.756080,2.302038]}";
-
-DynamicJsonDocument doc(1024);
-deserializeJson(doc, json);
-
-const char* sensor = doc["sensor"];
-long time          = doc["time"];
-double latitude    = doc["data"][0];
-double longitude   = doc["data"][1];
-```
-
-See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/deserialization/)
-
-### Serialization
-
-Here is a program that generates a JSON document with ArduinoJson:
-
-```c++
-DynamicJsonDocument doc(1024);
-
-doc["sensor"] = "gps";
-doc["time"]   = 1351824120;
-doc["data"][0] = 48.756080;
-doc["data"][1] = 2.302038;
-
-serializeJson(doc, Serial);
-// This prints:
-// {"sensor":"gps","time":1351824120,"data":[48.756080,2.302038]}
-```
-
-See the [tutorial on arduinojson.org](https://arduinojson.org/v6/doc/serialization/)
-
-## Sponsors
-
-ArduinoJson is thankful to its sponsors. Please give them a visit; they deserve it!
-
-<p>
-  <a href="https://www.programmingelectronics.com/" rel="sponsored">
-    <img src="https://arduinojson.org/images/2021/10/programmingeleactronicsacademy.png" alt="Programming Electronics Academy" width="200">
-  </a>
-</p>
-<p>
-  <a href="https://github.com/1technophile" rel="sponsored">
-    <img alt="1technophile" src="https://avatars.githubusercontent.com/u/12672732?s=40&v=4">
-  </a>
-</p>
-
-If you run a commercial project that embeds ArduinoJson, think about [sponsoring the library's development](https://github.com/sponsors/bblanchon): it ensures the code that your products rely on stays actively maintained. It can also give your project some exposure to the makers' community.
-
-If you are an individual user and want to support the development (or give a sign of appreciation), consider purchasing the book [Mastering ArduinoJson](https://arduinojson.org/book/)&nbsp;❤, or simply [cast a star](https://github.com/bblanchon/ArduinoJson/stargazers)&nbsp;⭐.
diff --git a/lib/ArduinoJson/idf_component.yml b/lib/ArduinoJson/idf_component.yml
new file mode 100644
index 000000000..429d37339
--- /dev/null
+++ b/lib/ArduinoJson/idf_component.yml
@@ -0,0 +1,13 @@
+version: "7.0.2"
+description: >-
+  A simple and efficient JSON library for embedded C++.
+  ⭐ 6444 stars on GitHub!
+  Supports serialization, deserialization, MessagePack, streams, filtering, and more.
+  Fully tested and documented.
+url: https://arduinojson.org/
+files:
+  exclude:
+    - "**/.vs/**/*"
+    - ".devcontainer/**/*"
+    - "examples/**/*"
+    - "extras/**/*"
diff --git a/lib/ArduinoJson/keywords.txt b/lib/ArduinoJson/keywords.txt
deleted file mode 100644
index 3dff06bfc..000000000
--- a/lib/ArduinoJson/keywords.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-# Macros
-JSON_ARRAY_SIZE	KEYWORD2
-JSON_OBJECT_SIZE	KEYWORD2
-JSON_STRING_SIZE	KEYWORD2
-
-# Free functions
-deserializeJson	KEYWORD2
-deserializeMsgPack	KEYWORD2
-serialized	KEYWORD2
-serializeJson	KEYWORD2
-serializeJsonPretty	KEYWORD2
-serializeMsgPack	KEYWORD2
-measureJson	KEYWORD2
-measureJsonPretty	KEYWORD2
-measureMsgPack	KEYWORD2
-
-# Methods
-add	KEYWORD2
-as	KEYWORD2
-createNestedArray	KEYWORD2
-createNestedObject	KEYWORD2
-get	KEYWORD2
-set	KEYWORD2
-to	KEYWORD2
-
-# Type names
-DeserializationError	KEYWORD1	DATA_TYPE
-DynamicJsonDocument	KEYWORD1	DATA_TYPE
-JsonArray	KEYWORD1	DATA_TYPE
-JsonArrayConst	KEYWORD1	DATA_TYPE
-JsonDocument	KEYWORD1	DATA_TYPE
-JsonFloat	KEYWORD1	DATA_TYPE
-JsonInteger	KEYWORD1	DATA_TYPE
-JsonObject	KEYWORD1	DATA_TYPE
-JsonObjectConst	KEYWORD1	DATA_TYPE
-JsonString	KEYWORD1	DATA_TYPE
-JsonUInt	KEYWORD1	DATA_TYPE
-JsonVariant	KEYWORD1	DATA_TYPE
-JsonVariantConst	KEYWORD1	DATA_TYPE
-StaticJsonDocument	KEYWORD1	DATA_TYPE
diff --git a/lib/ArduinoJson/library.json b/lib/ArduinoJson/library.json
new file mode 100644
index 000000000..46f156ac4
--- /dev/null
+++ b/lib/ArduinoJson/library.json
@@ -0,0 +1,23 @@
+{
+  "name": "ArduinoJson",
+  "keywords": "json, rest, http, web",
+  "description": "A simple and efficient JSON library for embedded C++. ⭐ 6444 stars on GitHub! Supports serialization, deserialization, MessagePack, streams, filtering, and more. Fully tested and documented.",
+  "homepage": "https://arduinojson.org/?utm_source=meta&utm_medium=library.json",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/bblanchon/ArduinoJson.git"
+  },
+  "version": "7.0.2",
+  "authors": {
+    "name": "Benoit Blanchon",
+    "url": "https://blog.benoitblanchon.fr"
+  },
+  "export": {
+    "include": ["src", "examples", "LICENSE.txt", "ArduinoJson.h"]
+  },
+  "frameworks": "*",
+  "platforms": "*",
+  "build": {
+    "libArchive": false
+  }
+}
diff --git a/lib/ArduinoJson/library.properties b/lib/ArduinoJson/library.properties
index 6a285cf0d..e9d9c2c7d 100644
--- a/lib/ArduinoJson/library.properties
+++ b/lib/ArduinoJson/library.properties
@@ -1,9 +1,9 @@
 name=ArduinoJson
-version=6.21.3
+version=7.0.2
 author=Benoit Blanchon <blog.benoitblanchon.fr>
 maintainer=Benoit Blanchon <blog.benoitblanchon.fr>
 sentence=A simple and efficient JSON library for embedded C++.
-paragraph=ArduinoJson supports ✔ serialization, ✔ deserialization, ✔ MessagePack, ✔ fixed allocation, ✔ zero-copy, ✔ streams, ✔ filtering, and more. It is the most popular Arduino library on GitHub ❤❤❤❤❤. Check out arduinojson.org for a comprehensive documentation.
+paragraph=⭐ 6444 stars on GitHub! Supports serialization, deserialization, MessagePack, streams, filtering, and more. Fully tested and documented.
 category=Data Processing
 url=https://arduinojson.org/?utm_source=meta&utm_medium=library.properties
 architectures=*
diff --git a/lib/ArduinoJson/src/ArduinoJson.h b/lib/ArduinoJson/src/ArduinoJson.h
index c9ac0ca64..fec64c3d1 100644
--- a/lib/ArduinoJson/src/ArduinoJson.h
+++ b/lib/ArduinoJson/src/ArduinoJson.h
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson.hpp b/lib/ArduinoJson/src/ArduinoJson.hpp
index 2d1b0be13..c210ed266 100644
--- a/lib/ArduinoJson/src/ArduinoJson.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -30,18 +30,19 @@
 #include "ArduinoJson/Object/JsonObject.hpp"
 #include "ArduinoJson/Variant/JsonVariantConst.hpp"
 
-#include "ArduinoJson/Document/DynamicJsonDocument.hpp"
-#include "ArduinoJson/Document/StaticJsonDocument.hpp"
+#include "ArduinoJson/Document/JsonDocument.hpp"
 
+#include "ArduinoJson/Array/ArrayImpl.hpp"
 #include "ArduinoJson/Array/ElementProxy.hpp"
-#include "ArduinoJson/Array/JsonArrayImpl.hpp"
 #include "ArduinoJson/Array/Utilities.hpp"
 #include "ArduinoJson/Collection/CollectionImpl.hpp"
-#include "ArduinoJson/Object/JsonObjectImpl.hpp"
+#include "ArduinoJson/Memory/VariantPoolImpl.hpp"
 #include "ArduinoJson/Object/MemberProxy.hpp"
+#include "ArduinoJson/Object/ObjectImpl.hpp"
 #include "ArduinoJson/Variant/ConverterImpl.hpp"
+#include "ArduinoJson/Variant/JsonVariantCopier.hpp"
 #include "ArduinoJson/Variant/VariantCompare.hpp"
-#include "ArduinoJson/Variant/VariantImpl.hpp"
+#include "ArduinoJson/Variant/VariantRefBaseImpl.hpp"
 
 #include "ArduinoJson/Json/JsonDeserializer.hpp"
 #include "ArduinoJson/Json/JsonSerializer.hpp"
diff --git a/lib/ArduinoJson/src/ArduinoJson/Array/ArrayData.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayData.hpp
new file mode 100644
index 000000000..93a65d543
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayData.hpp
@@ -0,0 +1,57 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Collection/CollectionData.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+class ArrayData : public CollectionData {
+ public:
+  VariantData* addElement(ResourceManager* resources) {
+    return addSlot(resources).data();
+  }
+
+  static VariantData* addElement(ArrayData* array, ResourceManager* resources) {
+    if (!array)
+      return nullptr;
+    return array->addElement(resources);
+  }
+
+  VariantData* getOrAddElement(size_t index, ResourceManager* resources);
+
+  VariantData* getElement(size_t index, const ResourceManager* resources) const;
+
+  static VariantData* getElement(const ArrayData* array, size_t index,
+                                 const ResourceManager* resources) {
+    if (!array)
+      return nullptr;
+    return array->getElement(index, resources);
+  }
+
+  void removeElement(size_t index, ResourceManager* resources);
+
+  static void removeElement(ArrayData* array, size_t index,
+                            ResourceManager* resources) {
+    if (!array)
+      return;
+    array->removeElement(index, resources);
+  }
+
+  bool copyFrom(const ArrayData& src, ResourceManager* resources);
+
+  static bool copy(ArrayData* dst, const ArrayData* src,
+                   ResourceManager* resources) {
+    if (!dst || !src)
+      return false;
+
+    return dst->copyFrom(*src, resources);
+  }
+
+ private:
+  iterator at(size_t index, const ResourceManager* resources) const;
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp
new file mode 100644
index 000000000..595e847b3
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Array/ArrayImpl.hpp
@@ -0,0 +1,50 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ArrayData.hpp>
+#include <ArduinoJson/Variant/VariantCompare.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+inline ArrayData::iterator ArrayData::at(
+    size_t index, const ResourceManager* resources) const {
+  auto it = createIterator(resources);
+  while (!it.done() && index) {
+    it.next(resources);
+    --index;
+  }
+  return it;
+}
+
+inline VariantData* ArrayData::getOrAddElement(size_t index,
+                                               ResourceManager* resources) {
+  auto it = createIterator(resources);
+  while (!it.done() && index > 0) {
+    it.next(resources);
+    index--;
+  }
+  if (it.done())
+    index++;
+  VariantData* element = it.data();
+  while (index > 0) {
+    element = addElement(resources);
+    if (!element)
+      return nullptr;
+    index--;
+  }
+  return element;
+}
+
+inline VariantData* ArrayData::getElement(
+    size_t index, const ResourceManager* resources) const {
+  return at(index, resources).data();
+}
+
+inline void ArrayData::removeElement(size_t index, ResourceManager* resources) {
+  remove(at(index, resources), resources);
+}
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp
index d6e9aa5d1..2ae26624a 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Array/ElementProxy.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -9,7 +9,7 @@
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 // A proxy class to get or set an element of an array.
-// https://arduinojson.org/v6/api/jsonarray/subscript/
+// https://arduinojson.org/v7/api/jsonarray/subscript/
 template <typename TUpstream>
 class ElementProxy : public VariantRefBase<ElementProxy<TUpstream>>,
                      public VariantOperators<ElementProxy<TUpstream>> {
@@ -40,17 +40,22 @@ class ElementProxy : public VariantRefBase<ElementProxy<TUpstream>>,
   }
 
  private:
-  FORCE_INLINE MemoryPool* getPool() const {
-    return VariantAttorney::getPool(upstream_);
+  FORCE_INLINE ResourceManager* getResourceManager() const {
+    return VariantAttorney::getResourceManager(upstream_);
   }
 
   FORCE_INLINE VariantData* getData() const {
-    return variantGetElement(VariantAttorney::getData(upstream_), index_);
+    return VariantData::getElement(
+        VariantAttorney::getData(upstream_), index_,
+        VariantAttorney::getResourceManager(upstream_));
   }
 
   FORCE_INLINE VariantData* getOrCreateData() const {
-    return variantGetOrAddElement(VariantAttorney::getOrCreateData(upstream_),
-                                  index_, VariantAttorney::getPool(upstream_));
+    auto data = VariantAttorney::getOrCreateData(upstream_);
+    if (!data)
+      return nullptr;
+    return data->getOrAddElement(
+        index_, VariantAttorney::getResourceManager(upstream_));
   }
 
   TUpstream upstream_;
diff --git a/lib/ArduinoJson/src/ArduinoJson/Array/JsonArray.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/JsonArray.hpp
index d208e4175..069c353de 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Array/JsonArray.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Array/JsonArray.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -12,7 +12,7 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 class JsonObject;
 
 // A reference to an array in a JsonDocument
-// https://arduinojson.org/v6/api/jsonarray/
+// https://arduinojson.org/v7/api/jsonarray/
 class JsonArray : public detail::VariantOperators<JsonArray> {
   friend class detail::VariantAttorney;
 
@@ -20,155 +20,166 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
   typedef JsonArrayIterator iterator;
 
   // Constructs an unbound reference.
-  FORCE_INLINE JsonArray() : data_(0), pool_(0) {}
+  FORCE_INLINE JsonArray() : data_(0), resources_(0) {}
 
   // INTERNAL USE ONLY
-  FORCE_INLINE JsonArray(detail::MemoryPool* pool, detail::CollectionData* data)
-      : data_(data), pool_(pool) {}
+  FORCE_INLINE JsonArray(detail::ArrayData* data,
+                         detail::ResourceManager* resources)
+      : data_(data), resources_(resources) {}
 
   // Returns a JsonVariant pointing to the array.
-  // https://arduinojson.org/v6/api/jsonvariant/
+  // https://arduinojson.org/v7/api/jsonvariant/
   operator JsonVariant() {
     void* data = data_;  // prevent warning cast-align
-    return JsonVariant(pool_, reinterpret_cast<detail::VariantData*>(data));
+    return JsonVariant(reinterpret_cast<detail::VariantData*>(data),
+                       resources_);
   }
 
   // Returns a read-only reference to the array.
-  // https://arduinojson.org/v6/api/jsonarrayconst/
+  // https://arduinojson.org/v7/api/jsonarrayconst/
   operator JsonArrayConst() const {
-    return JsonArrayConst(data_);
+    return JsonArrayConst(data_, resources_);
+  }
+
+  // Appends a new (empty) element to the array.
+  // Returns a reference to the new element.
+  // https://arduinojson.org/v7/api/jsonarray/add/
+  template <typename T>
+  typename detail::enable_if<!detail::is_same<T, JsonVariant>::value, T>::type
+  add() const {
+    return add<JsonVariant>().to<T>();
   }
 
   // Appends a new (null) element to the array.
   // Returns a reference to the new element.
-  // https://arduinojson.org/v6/api/jsonarray/add/
-  JsonVariant add() const {
-    if (!data_)
-      return JsonVariant();
-    return JsonVariant(pool_, data_->addElement(pool_));
+  // https://arduinojson.org/v7/api/jsonarray/add/
+  template <typename T>
+  typename detail::enable_if<detail::is_same<T, JsonVariant>::value, T>::type
+  add() const {
+    return JsonVariant(detail::ArrayData::addElement(data_, resources_),
+                       resources_);
   }
 
   // Appends a value to the array.
-  // https://arduinojson.org/v6/api/jsonarray/add/
+  // https://arduinojson.org/v7/api/jsonarray/add/
   template <typename T>
   FORCE_INLINE bool add(const T& value) const {
-    return add().set(value);
+    return add<JsonVariant>().set(value);
   }
 
   // Appends a value to the array.
-  // https://arduinojson.org/v6/api/jsonarray/add/
+  // https://arduinojson.org/v7/api/jsonarray/add/
   template <typename T>
   FORCE_INLINE bool add(T* value) const {
-    return add().set(value);
+    return add<JsonVariant>().set(value);
   }
 
   // Returns an iterator to the first element of the array.
-  // https://arduinojson.org/v6/api/jsonarray/begin/
+  // https://arduinojson.org/v7/api/jsonarray/begin/
   FORCE_INLINE iterator begin() const {
     if (!data_)
       return iterator();
-    return iterator(pool_, data_->head());
+    return iterator(data_->createIterator(resources_), resources_);
   }
 
   // Returns an iterator following the last element of the array.
-  // https://arduinojson.org/v6/api/jsonarray/end/
+  // https://arduinojson.org/v7/api/jsonarray/end/
   FORCE_INLINE iterator end() const {
     return iterator();
   }
 
   // Copies an array.
-  // https://arduinojson.org/v6/api/jsonarray/set/
+  // https://arduinojson.org/v7/api/jsonarray/set/
   FORCE_INLINE bool set(JsonArrayConst src) const {
-    if (!data_ || !src.data_)
+    if (!data_)
       return false;
-    return data_->copyFrom(*src.data_, pool_);
-  }
 
-  // Compares the content of two arrays.
-  FORCE_INLINE bool operator==(JsonArray rhs) const {
-    return JsonArrayConst(data_) == JsonArrayConst(rhs.data_);
+    clear();
+    for (auto element : src) {
+      if (!add(element))
+        return false;
+    }
+
+    return true;
   }
 
   // Removes the element at the specified iterator.
-  // ⚠️ Doesn't release the memory associated with the removed element.
-  // https://arduinojson.org/v6/api/jsonarray/remove/
+  // https://arduinojson.org/v7/api/jsonarray/remove/
   FORCE_INLINE void remove(iterator it) const {
-    if (!data_)
-      return;
-    data_->removeSlot(it.slot_);
+    detail::ArrayData::remove(data_, it.iterator_, resources_);
   }
 
   // Removes the element at the specified index.
-  // ⚠️ Doesn't release the memory associated with the removed element.
-  // https://arduinojson.org/v6/api/jsonarray/remove/
+  // https://arduinojson.org/v7/api/jsonarray/remove/
   FORCE_INLINE void remove(size_t index) const {
-    if (!data_)
-      return;
-    data_->removeElement(index);
+    detail::ArrayData::removeElement(data_, index, resources_);
   }
 
   // Removes all the elements of the array.
-  // ⚠️ Doesn't release the memory associated with the removed elements.
-  // https://arduinojson.org/v6/api/jsonarray/clear/
+  // https://arduinojson.org/v7/api/jsonarray/clear/
   void clear() const {
-    if (!data_)
-      return;
-    data_->clear();
+    detail::ArrayData::clear(data_, resources_);
   }
 
   // Gets or sets the element at the specified index.
-  // https://arduinojson.org/v6/api/jsonarray/subscript/
+  // https://arduinojson.org/v7/api/jsonarray/subscript/
   FORCE_INLINE detail::ElementProxy<JsonArray> operator[](size_t index) const {
     return {*this, index};
   }
 
-  // Creates an object and appends it to the array.
-  // https://arduinojson.org/v6/api/jsonarray/createnestedobject/
-  FORCE_INLINE JsonObject createNestedObject() const;
-
-  // Creates an array and appends it to the array.
-  // https://arduinojson.org/v6/api/jsonarray/createnestedarray/
-  FORCE_INLINE JsonArray createNestedArray() const {
-    return add().to<JsonArray>();
-  }
-
   operator JsonVariantConst() const {
-    return JsonVariantConst(collectionToVariant(data_));
+    return JsonVariantConst(collectionToVariant(data_), resources_);
   }
 
   // Returns true if the reference is unbound.
-  // https://arduinojson.org/v6/api/jsonarray/isnull/
+  // https://arduinojson.org/v7/api/jsonarray/isnull/
   FORCE_INLINE bool isNull() const {
     return data_ == 0;
   }
 
   // Returns true if the reference is bound.
-  // https://arduinojson.org/v6/api/jsonarray/isnull/
+  // https://arduinojson.org/v7/api/jsonarray/isnull/
   FORCE_INLINE operator bool() const {
     return data_ != 0;
   }
 
-  // Returns the number of bytes occupied by the array.
-  // https://arduinojson.org/v6/api/jsonarray/memoryusage/
-  FORCE_INLINE size_t memoryUsage() const {
-    return data_ ? data_->memoryUsage() : 0;
-  }
-
   // Returns the depth (nesting level) of the array.
-  // https://arduinojson.org/v6/api/jsonarray/nesting/
+  // https://arduinojson.org/v7/api/jsonarray/nesting/
   FORCE_INLINE size_t nesting() const {
-    return variantNesting(collectionToVariant(data_));
+    return detail::VariantData::nesting(collectionToVariant(data_), resources_);
   }
 
   // Returns the number of elements in the array.
-  // https://arduinojson.org/v6/api/jsonarray/size/
+  // https://arduinojson.org/v7/api/jsonarray/size/
   FORCE_INLINE size_t size() const {
-    return data_ ? data_->size() : 0;
+    return data_ ? data_->size(resources_) : 0;
+  }
+
+  // DEPRECATED: use add<JsonVariant>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonVariant>() instead")
+  JsonVariant add() const {
+    return add<JsonVariant>();
+  }
+
+  // DEPRECATED: use add<JsonArray>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonArray>() instead")
+  JsonArray createNestedArray() const {
+    return add<JsonArray>();
+  }
+
+  // DEPRECATED: use add<JsonObject>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonObject>() instead")
+  JsonObject createNestedObject() const;
+
+  // DEPRECATED: always returns zero
+  ARDUINOJSON_DEPRECATED("always returns zero")
+  size_t memoryUsage() const {
+    return 0;
   }
 
  private:
-  detail::MemoryPool* getPool() const {
-    return pool_;
+  detail::ResourceManager* getResourceManager() const {
+    return resources_;
   }
 
   detail::VariantData* getData() const {
@@ -179,33 +190,8 @@ class JsonArray : public detail::VariantOperators<JsonArray> {
     return collectionToVariant(data_);
   }
 
-  detail::CollectionData* data_;
-  detail::MemoryPool* pool_;
-};
-
-template <>
-struct Converter<JsonArray> : private detail::VariantAttorney {
-  static void toJson(JsonVariantConst src, JsonVariant dst) {
-    variantCopyFrom(getData(dst), getData(src), getPool(dst));
-  }
-
-  static JsonArray fromJson(JsonVariant src) {
-    auto data = getData(src);
-    auto pool = getPool(src);
-    return JsonArray(pool, data != 0 ? data->asArray() : 0);
-  }
-
-  static detail::InvalidConversion<JsonVariantConst, JsonArray> fromJson(
-      JsonVariantConst);
-
-  static bool checkJson(JsonVariantConst) {
-    return false;
-  }
-
-  static bool checkJson(JsonVariant src) {
-    auto data = getData(src);
-    return data && data->isArray();
-  }
+  detail::ArrayData* data_;
+  detail::ResourceManager* resources_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayConst.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayConst.hpp
index 6a6463c8c..526975a24 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayConst.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayConst.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -13,7 +13,7 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 class JsonObject;
 
 // A read-only reference to an array in a JsonDocument
-// https://arduinojson.org/v6/api/jsonarrayconst/
+// https://arduinojson.org/v7/api/jsonarrayconst/
 class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   friend class JsonArray;
   friend class detail::VariantAttorney;
@@ -22,15 +22,15 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   typedef JsonArrayConstIterator iterator;
 
   // Returns an iterator to the first element of the array.
-  // https://arduinojson.org/v6/api/jsonarrayconst/begin/
+  // https://arduinojson.org/v7/api/jsonarrayconst/begin/
   FORCE_INLINE iterator begin() const {
     if (!data_)
       return iterator();
-    return iterator(data_->head());
+    return iterator(data_->createIterator(resources_), resources_);
   }
 
   // Returns an iterator to the element following the last element of the array.
-  // https://arduinojson.org/v6/api/jsonarrayconst/end/
+  // https://arduinojson.org/v7/api/jsonarrayconst/end/
   FORCE_INLINE iterator end() const {
     return iterator();
   }
@@ -39,72 +39,49 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
   FORCE_INLINE JsonArrayConst() : data_(0) {}
 
   // INTERNAL USE ONLY
-  FORCE_INLINE JsonArrayConst(const detail::CollectionData* data)
-      : data_(data) {}
-
-  // Compares the content of two arrays.
-  // Returns true if the two arrays are equal.
-  FORCE_INLINE bool operator==(JsonArrayConst rhs) const {
-    if (data_ == rhs.data_)
-      return true;
-    if (!data_ || !rhs.data_)
-      return false;
-
-    iterator it1 = begin();
-    iterator it2 = rhs.begin();
-
-    for (;;) {
-      bool end1 = it1 == end();
-      bool end2 = it2 == rhs.end();
-      if (end1 && end2)
-        return true;
-      if (end1 || end2)
-        return false;
-      if (*it1 != *it2)
-        return false;
-      ++it1;
-      ++it2;
-    }
-  }
+  FORCE_INLINE JsonArrayConst(const detail::ArrayData* data,
+                              const detail::ResourceManager* resources)
+      : data_(data), resources_(resources) {}
 
   // Returns the element at the specified index.
-  // https://arduinojson.org/v6/api/jsonarrayconst/subscript/
+  // https://arduinojson.org/v7/api/jsonarrayconst/subscript/
   FORCE_INLINE JsonVariantConst operator[](size_t index) const {
-    return JsonVariantConst(data_ ? data_->getElement(index) : 0);
+    return JsonVariantConst(
+        detail::ArrayData::getElement(data_, index, resources_), resources_);
   }
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(collectionToVariant(data_));
+    return JsonVariantConst(getData(), resources_);
   }
 
   // Returns true if the reference is unbound.
-  // https://arduinojson.org/v6/api/jsonarrayconst/isnull/
+  // https://arduinojson.org/v7/api/jsonarrayconst/isnull/
   FORCE_INLINE bool isNull() const {
     return data_ == 0;
   }
 
   // Returns true if the reference is bound.
-  // https://arduinojson.org/v6/api/jsonarrayconst/isnull/
+  // https://arduinojson.org/v7/api/jsonarrayconst/isnull/
   FORCE_INLINE operator bool() const {
     return data_ != 0;
   }
 
-  // Returns the number of bytes occupied by the array.
-  // https://arduinojson.org/v6/api/jsonarrayconst/memoryusage/
-  FORCE_INLINE size_t memoryUsage() const {
-    return data_ ? data_->memoryUsage() : 0;
-  }
-
   // Returns the depth (nesting level) of the array.
-  // https://arduinojson.org/v6/api/jsonarrayconst/nesting/
+  // https://arduinojson.org/v7/api/jsonarrayconst/nesting/
   FORCE_INLINE size_t nesting() const {
-    return variantNesting(collectionToVariant(data_));
+    return detail::VariantData::nesting(getData(), resources_);
   }
 
   // Returns the number of elements in the array.
-  // https://arduinojson.org/v6/api/jsonarrayconst/size/
+  // https://arduinojson.org/v7/api/jsonarrayconst/size/
   FORCE_INLINE size_t size() const {
-    return data_ ? data_->size() : 0;
+    return data_ ? data_->size(resources_) : 0;
+  }
+
+  // DEPRECATED: always returns zero
+  ARDUINOJSON_DEPRECATED("always returns zero")
+  size_t memoryUsage() const {
+    return 0;
   }
 
  private:
@@ -112,24 +89,31 @@ class JsonArrayConst : public detail::VariantOperators<JsonArrayConst> {
     return collectionToVariant(data_);
   }
 
-  const detail::CollectionData* data_;
+  const detail::ArrayData* data_;
+  const detail::ResourceManager* resources_;
 };
 
-template <>
-struct Converter<JsonArrayConst> : private detail::VariantAttorney {
-  static void toJson(JsonVariantConst src, JsonVariant dst) {
-    variantCopyFrom(getData(dst), getData(src), getPool(dst));
-  }
+// Compares the content of two arrays.
+// Returns true if the two arrays are equal.
+inline bool operator==(JsonArrayConst lhs, JsonArrayConst rhs) {
+  if (!lhs && !rhs)
+    return true;
+  if (!lhs || !rhs)
+    return false;
 
-  static JsonArrayConst fromJson(JsonVariantConst src) {
-    auto data = getData(src);
-    return data ? data->asArray() : 0;
-  }
+  auto a = lhs.begin();
+  auto b = rhs.begin();
 
-  static bool checkJson(JsonVariantConst src) {
-    auto data = getData(src);
-    return data && data->isArray();
+  for (;;) {
+    if (a == b)  // same pointer or both null
+      return true;
+    if (a == lhs.end() || b == rhs.end())
+      return false;
+    if (*a != *b)
+      return false;
+    ++a;
+    ++b;
   }
-};
+}
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayImpl.hpp
deleted file mode 100644
index dc0487af8..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayImpl.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Array/JsonArray.hpp>
-#include <ArduinoJson/Object/JsonObject.hpp>
-
-ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
-
-inline JsonObject JsonArray::createNestedObject() const {
-  return add().to<JsonObject>();
-}
-
-ARDUINOJSON_END_PUBLIC_NAMESPACE
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-template <typename TDerived>
-inline JsonArray VariantRefBase<TDerived>::createNestedArray() const {
-  return add().template to<JsonArray>();
-}
-
-template <typename TDerived>
-inline JsonObject VariantRefBase<TDerived>::createNestedObject() const {
-  return add().template to<JsonObject>();
-}
-
-template <typename TDerived>
-inline ElementProxy<TDerived> VariantRefBase<TDerived>::operator[](
-    size_t index) const {
-  return ElementProxy<TDerived>(derived(), index);
-}
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayIterator.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayIterator.hpp
index d9048b28c..70bb28f4a 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayIterator.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Array/JsonArrayIterator.hpp
@@ -1,121 +1,96 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Variant/JsonVariant.hpp>
-#include <ArduinoJson/Variant/SlotFunctions.hpp>
 
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
-class VariantPtr {
+template <typename T>
+class Ptr {
  public:
-  VariantPtr(detail::MemoryPool* pool, detail::VariantData* data)
-      : variant_(pool, data) {}
+  Ptr(T value) : value_(value) {}
 
-  JsonVariant* operator->() {
-    return &variant_;
+  T* operator->() {
+    return &value_;
   }
 
-  JsonVariant& operator*() {
-    return variant_;
+  T& operator*() {
+    return value_;
   }
 
  private:
-  JsonVariant variant_;
+  T value_;
 };
 
 class JsonArrayIterator {
   friend class JsonArray;
 
  public:
-  JsonArrayIterator() : slot_(0) {}
-  explicit JsonArrayIterator(detail::MemoryPool* pool,
-                             detail::VariantSlot* slot)
-      : pool_(pool), slot_(slot) {}
+  JsonArrayIterator() {}
+  explicit JsonArrayIterator(detail::ArrayData::iterator iterator,
+                             detail::ResourceManager* resources)
+      : iterator_(iterator), resources_(resources) {}
 
-  JsonVariant operator*() const {
-    return JsonVariant(pool_, slot_->data());
+  JsonVariant operator*() {
+    return JsonVariant(iterator_.data(), resources_);
   }
-  VariantPtr operator->() {
-    return VariantPtr(pool_, slot_->data());
+  Ptr<JsonVariant> operator->() {
+    return operator*();
   }
 
   bool operator==(const JsonArrayIterator& other) const {
-    return slot_ == other.slot_;
+    return iterator_ == other.iterator_;
   }
 
   bool operator!=(const JsonArrayIterator& other) const {
-    return slot_ != other.slot_;
+    return iterator_ != other.iterator_;
   }
 
   JsonArrayIterator& operator++() {
-    slot_ = slot_->next();
-    return *this;
-  }
-
-  JsonArrayIterator& operator+=(size_t distance) {
-    slot_ = slot_->next(distance);
+    iterator_.next(resources_);
     return *this;
   }
 
  private:
-  detail::MemoryPool* pool_;
-  detail::VariantSlot* slot_;
-};
-
-class VariantConstPtr {
- public:
-  VariantConstPtr(const detail::VariantData* data) : variant_(data) {}
-
-  JsonVariantConst* operator->() {
-    return &variant_;
-  }
-
-  JsonVariantConst& operator*() {
-    return variant_;
-  }
-
- private:
-  JsonVariantConst variant_;
+  detail::ArrayData::iterator iterator_;
+  detail::ResourceManager* resources_;
 };
 
 class JsonArrayConstIterator {
   friend class JsonArray;
 
  public:
-  JsonArrayConstIterator() : slot_(0) {}
-  explicit JsonArrayConstIterator(const detail::VariantSlot* slot)
-      : slot_(slot) {}
+  JsonArrayConstIterator() {}
+  explicit JsonArrayConstIterator(detail::ArrayData::iterator iterator,
+                                  const detail::ResourceManager* resources)
+      : iterator_(iterator), resources_(resources) {}
 
   JsonVariantConst operator*() const {
-    return JsonVariantConst(slot_->data());
+    return JsonVariantConst(iterator_.data(), resources_);
   }
-  VariantConstPtr operator->() {
-    return VariantConstPtr(slot_->data());
+  Ptr<JsonVariantConst> operator->() {
+    return operator*();
   }
 
   bool operator==(const JsonArrayConstIterator& other) const {
-    return slot_ == other.slot_;
+    return iterator_ == other.iterator_;
   }
 
   bool operator!=(const JsonArrayConstIterator& other) const {
-    return slot_ != other.slot_;
+    return iterator_ != other.iterator_;
   }
 
   JsonArrayConstIterator& operator++() {
-    slot_ = slot_->next();
-    return *this;
-  }
-
-  JsonArrayConstIterator& operator+=(size_t distance) {
-    slot_ = slot_->next(distance);
+    iterator_.next(resources_);
     return *this;
   }
 
  private:
-  const detail::VariantSlot* slot_;
+  detail::ArrayData::iterator iterator_;
+  const detail::ResourceManager* resources_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp b/lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp
index 398e11d45..ff589cea8 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Array/Utilities.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -18,7 +18,7 @@ copyArray(const T& src, JsonVariant dst) {
 }
 
 // Copies values from an array to a JsonArray or a JsonVariant.
-// https://arduinojson.org/v6/api/misc/copyarray/
+// https://arduinojson.org/v7/api/misc/copyarray/
 template <typename T, size_t N, typename TDestination>
 inline typename detail::enable_if<
     !detail::is_base_of<JsonDocument, TDestination>::value, bool>::type
@@ -27,14 +27,14 @@ copyArray(T (&src)[N], const TDestination& dst) {
 }
 
 // Copies values from an array to a JsonArray or a JsonVariant.
-// https://arduinojson.org/v6/api/misc/copyarray/
+// https://arduinojson.org/v7/api/misc/copyarray/
 template <typename T, typename TDestination>
 inline typename detail::enable_if<
     !detail::is_base_of<JsonDocument, TDestination>::value, bool>::type
 copyArray(const T* src, size_t len, const TDestination& dst) {
   bool ok = true;
   for (size_t i = 0; i < len; i++) {
-    ok &= copyArray(src[i], dst.add());
+    ok &= copyArray(src[i], dst.template add<JsonVariant>());
   }
   return ok;
 }
@@ -47,14 +47,14 @@ inline bool copyArray(const char* src, size_t, const TDestination& dst) {
 }
 
 // Copies values from an array to a JsonDocument.
-// https://arduinojson.org/v6/api/misc/copyarray/
+// https://arduinojson.org/v7/api/misc/copyarray/
 template <typename T>
 inline bool copyArray(const T& src, JsonDocument& dst) {
   return copyArray(src, dst.to<JsonArray>());
 }
 
 // Copies an array to a JsonDocument.
-// https://arduinojson.org/v6/api/misc/copyarray/
+// https://arduinojson.org/v7/api/misc/copyarray/
 template <typename T>
 inline bool copyArray(const T* src, size_t len, JsonDocument& dst) {
   return copyArray(src, len, dst.to<JsonArray>());
@@ -70,14 +70,14 @@ copyArray(JsonVariantConst src, T& dst) {
 }
 
 // Copies values from a JsonArray or JsonVariant to an array.
-// https://arduinojson.org/v6/api/misc/copyarray/
+// https://arduinojson.org/v7/api/misc/copyarray/
 template <typename T, size_t N>
 inline size_t copyArray(JsonArrayConst src, T (&dst)[N]) {
   return copyArray(src, dst, N);
 }
 
 // Copies values from a JsonArray or JsonVariant to an array.
-// https://arduinojson.org/v6/api/misc/copyarray/
+// https://arduinojson.org/v7/api/misc/copyarray/
 template <typename T>
 inline size_t copyArray(JsonArrayConst src, T* dst, size_t len) {
   size_t i = 0;
@@ -101,7 +101,7 @@ inline size_t copyArray(JsonVariantConst src, char (&dst)[N]) {
 }
 
 // Copies values from a JsonDocument to an array.
-// https://arduinojson.org/v6/api/misc/copyarray/
+// https://arduinojson.org/v7/api/misc/copyarray/
 template <typename TSource, typename T>
 inline typename detail::enable_if<
     detail::is_array<T>::value &&
diff --git a/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp b/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp
index 090c98b9e..1010795ce 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionData.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -11,74 +11,108 @@
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
-class MemoryPool;
 class VariantData;
 class VariantSlot;
 
-class CollectionData {
-  VariantSlot* head_;
-  VariantSlot* tail_;
+class CollectionIterator {
+  friend class CollectionData;
 
  public:
-  // Must be a POD!
-  // - no constructor
-  // - no destructor
-  // - no virtual
-  // - no inheritance
+  CollectionIterator() : slot_(nullptr), currentId_(NULL_SLOT) {}
 
-  // Array only
+  void next(const ResourceManager* resources);
 
-  VariantData* addElement(MemoryPool* pool);
-
-  VariantData* getElement(size_t index) const;
-
-  VariantData* getOrAddElement(size_t index, MemoryPool* pool);
-
-  void removeElement(size_t index);
-
-  // Object only
-
-  template <typename TAdaptedString>
-  VariantData* addMember(TAdaptedString key, MemoryPool* pool);
-
-  template <typename TAdaptedString>
-  VariantData* getMember(TAdaptedString key) const;
-
-  template <typename TAdaptedString>
-  VariantData* getOrAddMember(TAdaptedString key, MemoryPool* pool);
-
-  template <typename TAdaptedString>
-  void removeMember(TAdaptedString key) {
-    removeSlot(getSlot(key));
+  bool done() const {
+    return slot_ == nullptr;
   }
 
-  template <typename TAdaptedString>
-  bool containsKey(const TAdaptedString& key) const;
-
-  // Generic
-
-  void clear();
-  size_t memoryUsage() const;
-  size_t size() const;
-
-  VariantSlot* addSlot(MemoryPool*);
-  void removeSlot(VariantSlot* slot);
-
-  bool copyFrom(const CollectionData& src, MemoryPool* pool);
-
-  VariantSlot* head() const {
-    return head_;
+  bool operator==(const CollectionIterator& other) const {
+    return slot_ == other.slot_;
   }
 
-  void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance);
+  bool operator!=(const CollectionIterator& other) const {
+    return slot_ != other.slot_;
+  }
+
+  VariantData* operator->() {
+    ARDUINOJSON_ASSERT(slot_ != nullptr);
+    return data();
+  }
+
+  VariantData& operator*() {
+    ARDUINOJSON_ASSERT(slot_ != nullptr);
+    return *data();
+  }
+
+  const VariantData& operator*() const {
+    ARDUINOJSON_ASSERT(slot_ != nullptr);
+    return *data();
+  }
+
+  const char* key() const;
+  bool ownsKey() const;
+
+  void setKey(StringNode*);
+  void setKey(const char*);
+
+  VariantData* data() {
+    return reinterpret_cast<VariantData*>(slot_);
+  }
+
+  const VariantData* data() const {
+    return reinterpret_cast<const VariantData*>(slot_);
+  }
 
  private:
-  VariantSlot* getSlot(size_t index) const;
+  CollectionIterator(VariantSlot* slot, SlotId slotId);
 
-  template <typename TAdaptedString>
-  VariantSlot* getSlot(TAdaptedString key) const;
+  VariantSlot* slot_;
+  SlotId currentId_, nextId_;
+};
 
-  VariantSlot* getPreviousSlot(VariantSlot*) const;
+class CollectionData {
+  SlotId head_ = NULL_SLOT;
+  SlotId tail_ = NULL_SLOT;
+
+ public:
+  // Placement new
+  static void* operator new(size_t, void* p) noexcept {
+    return p;
+  }
+
+  static void operator delete(void*, void*) noexcept {}
+
+  using iterator = CollectionIterator;
+
+  iterator createIterator(const ResourceManager* resources) const {
+    return iterator(resources->getSlot(head_), head_);
+  }
+
+  size_t size(const ResourceManager*) const;
+  size_t nesting(const ResourceManager*) const;
+
+  void clear(ResourceManager* resources);
+
+  static void clear(CollectionData* collection, ResourceManager* resources) {
+    if (!collection)
+      return;
+    collection->clear(resources);
+  }
+
+  void remove(iterator it, ResourceManager* resources);
+
+  static void remove(CollectionData* collection, iterator it,
+                     ResourceManager* resources) {
+    if (collection)
+      return collection->remove(it, resources);
+  }
+
+ protected:
+  iterator addSlot(ResourceManager*);
+
+ private:
+  SlotWithId getPreviousSlot(VariantSlot*, const ResourceManager*) const;
+  void releaseSlot(SlotWithId, ResourceManager*);
 };
 
 inline const VariantData* collectionToVariant(
diff --git a/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp
index 134d5bd64..79d9ac72b 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Collection/CollectionImpl.hpp
@@ -1,197 +1,133 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Collection/CollectionData.hpp>
-#include <ArduinoJson/Strings/StoragePolicy.hpp>
+#include <ArduinoJson/Memory/Alignment.hpp>
 #include <ArduinoJson/Strings/StringAdapters.hpp>
+#include <ArduinoJson/Variant/VariantCompare.hpp>
 #include <ArduinoJson/Variant/VariantData.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
-inline VariantSlot* CollectionData::addSlot(MemoryPool* pool) {
-  VariantSlot* slot = pool->allocVariant();
-  if (!slot)
-    return 0;
+inline CollectionIterator::CollectionIterator(VariantSlot* slot, SlotId slotId)
+    : slot_(slot), currentId_(slotId) {
+  nextId_ = slot_ ? slot_->next() : NULL_SLOT;
+}
 
-  if (tail_) {
-    ARDUINOJSON_ASSERT(pool->owns(tail_));  // Can't alter a linked array/object
-    tail_->setNextNotNull(slot);
-    tail_ = slot;
+inline const char* CollectionIterator::key() const {
+  ARDUINOJSON_ASSERT(slot_ != nullptr);
+  return slot_->key();
+}
+
+inline void CollectionIterator::setKey(const char* s) {
+  ARDUINOJSON_ASSERT(slot_ != nullptr);
+  ARDUINOJSON_ASSERT(s != nullptr);
+  return slot_->setKey(s);
+}
+
+inline void CollectionIterator::setKey(StringNode* s) {
+  ARDUINOJSON_ASSERT(slot_ != nullptr);
+  ARDUINOJSON_ASSERT(s != nullptr);
+  return slot_->setKey(s);
+}
+
+inline bool CollectionIterator::ownsKey() const {
+  ARDUINOJSON_ASSERT(slot_ != nullptr);
+  return slot_->ownsKey();
+}
+
+inline void CollectionIterator::next(const ResourceManager* resources) {
+  ARDUINOJSON_ASSERT(currentId_ != NULL_SLOT);
+  slot_ = resources->getSlot(nextId_);
+  currentId_ = nextId_;
+  if (slot_)
+    nextId_ = slot_->next();
+}
+
+inline CollectionData::iterator CollectionData::addSlot(
+    ResourceManager* resources) {
+  auto slot = resources->allocSlot();
+  if (!slot)
+    return {};
+  if (tail_ != NULL_SLOT) {
+    auto tail = resources->getSlot(tail_);
+    tail->setNext(slot.id());
+    tail_ = slot.id();
   } else {
-    head_ = slot;
-    tail_ = slot;
+    head_ = slot.id();
+    tail_ = slot.id();
+  }
+  return iterator(slot, slot.id());
+}
+
+inline void CollectionData::clear(ResourceManager* resources) {
+  auto next = head_;
+  while (next != NULL_SLOT) {
+    auto currId = next;
+    auto slot = resources->getSlot(next);
+    next = slot->next();
+    releaseSlot(SlotWithId(slot, currId), resources);
   }
 
-  slot->clear();
-  return slot;
+  head_ = NULL_SLOT;
+  tail_ = NULL_SLOT;
 }
 
-inline VariantData* CollectionData::addElement(MemoryPool* pool) {
-  return slotData(addSlot(pool));
-}
-
-template <typename TAdaptedString>
-inline VariantData* CollectionData::addMember(TAdaptedString key,
-                                              MemoryPool* pool) {
-  VariantSlot* slot = addSlot(pool);
-  if (!slotSetKey(slot, key, pool)) {
-    removeSlot(slot);
-    return 0;
+inline SlotWithId CollectionData::getPreviousSlot(
+    VariantSlot* target, const ResourceManager* resources) const {
+  auto prev = SlotWithId();
+  auto currentId = head_;
+  while (currentId != NULL_SLOT) {
+    auto currentSlot = resources->getSlot(currentId);
+    if (currentSlot == target)
+      return prev;
+    prev = SlotWithId(currentSlot, currentId);
+    currentId = currentSlot->next();
   }
-  return slot->data();
+  return SlotWithId();
 }
 
-inline void CollectionData::clear() {
-  head_ = 0;
-  tail_ = 0;
-}
-
-template <typename TAdaptedString>
-inline bool CollectionData::containsKey(const TAdaptedString& key) const {
-  return getSlot(key) != 0;
-}
-
-inline bool CollectionData::copyFrom(const CollectionData& src,
-                                     MemoryPool* pool) {
-  clear();
-  for (VariantSlot* s = src.head_; s; s = s->next()) {
-    VariantData* var;
-    if (s->key() != 0) {
-      JsonString key(s->key(),
-                     s->ownsKey() ? JsonString::Copied : JsonString::Linked);
-      var = addMember(adaptString(key), pool);
-    } else {
-      var = addElement(pool);
-    }
-    if (!var)
-      return false;
-    if (!var->copyFrom(*s->data(), pool))
-      return false;
-  }
-  return true;
-}
-
-template <typename TAdaptedString>
-inline VariantSlot* CollectionData::getSlot(TAdaptedString key) const {
-  if (key.isNull())
-    return 0;
-  VariantSlot* slot = head_;
-  while (slot) {
-    if (stringEquals(key, adaptString(slot->key())))
-      break;
-    slot = slot->next();
-  }
-  return slot;
-}
-
-inline VariantSlot* CollectionData::getSlot(size_t index) const {
-  if (!head_)
-    return 0;
-  return head_->next(index);
-}
-
-inline VariantSlot* CollectionData::getPreviousSlot(VariantSlot* target) const {
-  VariantSlot* current = head_;
-  while (current) {
-    VariantSlot* next = current->next();
-    if (next == target)
-      return current;
-    current = next;
-  }
-  return 0;
-}
-
-template <typename TAdaptedString>
-inline VariantData* CollectionData::getMember(TAdaptedString key) const {
-  VariantSlot* slot = getSlot(key);
-  return slot ? slot->data() : 0;
-}
-
-template <typename TAdaptedString>
-inline VariantData* CollectionData::getOrAddMember(TAdaptedString key,
-                                                   MemoryPool* pool) {
-  // ignore null key
-  if (key.isNull())
-    return 0;
-
-  // search a matching key
-  VariantSlot* slot = getSlot(key);
-  if (slot)
-    return slot->data();
-
-  return addMember(key, pool);
-}
-
-inline VariantData* CollectionData::getElement(size_t index) const {
-  VariantSlot* slot = getSlot(index);
-  return slot ? slot->data() : 0;
-}
-
-inline VariantData* CollectionData::getOrAddElement(size_t index,
-                                                    MemoryPool* pool) {
-  VariantSlot* slot = head_;
-  while (slot && index > 0) {
-    slot = slot->next();
-    index--;
-  }
-  if (!slot)
-    index++;
-  while (index > 0) {
-    slot = addSlot(pool);
-    index--;
-  }
-  return slotData(slot);
-}
-
-inline void CollectionData::removeSlot(VariantSlot* slot) {
-  if (!slot)
+inline void CollectionData::remove(iterator it, ResourceManager* resources) {
+  if (it.done())
     return;
-  VariantSlot* prev = getPreviousSlot(slot);
-  VariantSlot* next = slot->next();
+  auto curr = it.slot_;
+  auto prev = getPreviousSlot(curr, resources);
+  auto next = curr->next();
   if (prev)
     prev->setNext(next);
   else
     head_ = next;
-  if (!next)
-    tail_ = prev;
+  if (next == NULL_SLOT)
+    tail_ = prev.id();
+  releaseSlot({it.slot_, it.currentId_}, resources);
 }
 
-inline void CollectionData::removeElement(size_t index) {
-  removeSlot(getSlot(index));
-}
-
-inline size_t CollectionData::memoryUsage() const {
-  size_t total = 0;
-  for (VariantSlot* s = head_; s; s = s->next()) {
-    total += sizeof(VariantSlot) + s->data()->memoryUsage();
-    if (s->ownsKey())
-      total += strlen(s->key()) + 1;
+inline size_t CollectionData::nesting(const ResourceManager* resources) const {
+  size_t maxChildNesting = 0;
+  for (auto it = createIterator(resources); !it.done(); it.next(resources)) {
+    size_t childNesting = it->nesting(resources);
+    if (childNesting > maxChildNesting)
+      maxChildNesting = childNesting;
   }
-  return total;
+  return maxChildNesting + 1;
 }
 
-inline size_t CollectionData::size() const {
-  return slotSize(head_);
+inline size_t CollectionData::size(const ResourceManager* resources) const {
+  size_t count = 0;
+  for (auto it = createIterator(resources); !it.done(); it.next(resources))
+    count++;
+  return count;
 }
 
-template <typename T>
-inline void movePointer(T*& p, ptrdiff_t offset) {
-  if (!p)
-    return;
-  p = reinterpret_cast<T*>(
-      reinterpret_cast<void*>(reinterpret_cast<char*>(p) + offset));
-  ARDUINOJSON_ASSERT(isAligned(p));
-}
-
-inline void CollectionData::movePointers(ptrdiff_t stringDistance,
-                                         ptrdiff_t variantDistance) {
-  movePointer(head_, variantDistance);
-  movePointer(tail_, variantDistance);
-  for (VariantSlot* slot = head_; slot; slot = slot->next())
-    slot->movePointers(stringDistance, variantDistance);
+inline void CollectionData::releaseSlot(SlotWithId slot,
+                                        ResourceManager* resources) {
+  if (slot->ownsKey())
+    resources->dereferenceString(slot->key());
+  slot->data()->setNull(resources);
+  resources->freeSlot(slot);
 }
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Configuration.hpp b/lib/ArduinoJson/src/ArduinoJson/Configuration.hpp
index ac0ea660a..12d60688a 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Configuration.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Configuration.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -59,15 +59,24 @@
 #  define ARDUINOJSON_USE_DOUBLE 1
 #endif
 
-// Store integral values with long (0) or long long (1)
-#ifndef ARDUINOJSON_USE_LONG_LONG
-#  if defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ >= 4 || \
-      defined(_MSC_VER)
-#    define ARDUINOJSON_USE_LONG_LONG 1
+// Pointer size: a heuristic to set sensible defaults
+#ifndef ARDUINOJSON_SIZEOF_POINTER
+#  if defined(__SIZEOF_POINTER__)
+#    define ARDUINOJSON_SIZEOF_POINTER __SIZEOF_POINTER__
+#  elif defined(_WIN64) && _WIN64
+#    define ARDUINOJSON_SIZEOF_POINTER 8  // 64 bits
+#  else
+#    define ARDUINOJSON_SIZEOF_POINTER 4  // assume 32 bits otherwise
 #  endif
 #endif
+
+// Store integral values with long (0) or long long (1)
 #ifndef ARDUINOJSON_USE_LONG_LONG
-#  define ARDUINOJSON_USE_LONG_LONG 0
+#  if ARDUINOJSON_SIZEOF_POINTER >= 4  // 32 & 64 bits systems
+#    define ARDUINOJSON_USE_LONG_LONG 1
+#  else
+#    define ARDUINOJSON_USE_LONG_LONG 0
+#  endif
 #endif
 
 // Limit nesting as the stack is likely to be small
@@ -75,19 +84,50 @@
 #  define ARDUINOJSON_DEFAULT_NESTING_LIMIT 10
 #endif
 
-// Number of bits to store the pointer to next node
-// (saves RAM but limits the number of values in a document)
-#ifndef ARDUINOJSON_SLOT_OFFSET_SIZE
-#  if defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ <= 2
-// Address space == 16-bit => max 127 values
-#    define ARDUINOJSON_SLOT_OFFSET_SIZE 1
-#  elif defined(__SIZEOF_POINTER__) && __SIZEOF_POINTER__ >= 8 || \
-      defined(_WIN64) && _WIN64
-// Address space == 64-bit => max 2147483647 values
-#    define ARDUINOJSON_SLOT_OFFSET_SIZE 4
+// Number of bytes to store the variant identifier
+#ifndef ARDUINOJSON_SLOT_ID_SIZE
+#  if ARDUINOJSON_SIZEOF_POINTER <= 2
+#    define ARDUINOJSON_SLOT_ID_SIZE 1  // up to 255 slots
+#  elif ARDUINOJSON_SIZEOF_POINTER == 4
+#    define ARDUINOJSON_SLOT_ID_SIZE 2  // up to 65535 slots
 #  else
-// Address space == 32-bit => max 32767 values
-#    define ARDUINOJSON_SLOT_OFFSET_SIZE 2
+#    define ARDUINOJSON_SLOT_ID_SIZE 4  // up to 4294967295 slots
+#  endif
+#endif
+
+// Capacity of each variant pool (in slots)
+#ifndef ARDUINOJSON_POOL_CAPACITY
+#  if ARDUINOJSON_SIZEOF_POINTER <= 2
+#    define ARDUINOJSON_POOL_CAPACITY 16  // 128 bytes
+#  elif ARDUINOJSON_SIZEOF_POINTER == 4
+#    define ARDUINOJSON_POOL_CAPACITY 64  // 1024 bytes
+#  else
+#    define ARDUINOJSON_POOL_CAPACITY 128  // 3072 bytes
+#  endif
+#endif
+
+// Initial capacity of the pool list
+#ifndef ARDUINOJSON_INITIAL_POOL_COUNT
+#  define ARDUINOJSON_INITIAL_POOL_COUNT 4
+#endif
+
+// Automatically call shrinkToFit() from deserializeXxx()
+// Disabled by default on 8-bit platforms because it's not worth the increase in
+// code size
+#ifndef ARDUINOJSON_AUTO_SHRINK
+#  if ARDUINOJSON_SIZEOF_POINTER <= 2
+#    define ARDUINOJSON_AUTO_SHRINK 0
+#  else
+#    define ARDUINOJSON_AUTO_SHRINK 1
+#  endif
+#endif
+
+// Number of bytes to store the length of a string
+#ifndef ARDUINOJSON_STRING_LENGTH_SIZE
+#  if ARDUINOJSON_SIZEOF_POINTER <= 2
+#    define ARDUINOJSON_STRING_LENGTH_SIZE 1  // up to 255 characters
+#  else
+#    define ARDUINOJSON_STRING_LENGTH_SIZE 2  // up to 65535 characters
 #  endif
 #endif
 
@@ -195,10 +235,6 @@
 #  define ARDUINOJSON_TAB "  "
 #endif
 
-#ifndef ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
-#  define ARDUINOJSON_ENABLE_STRING_DEDUPLICATION 1
-#endif
-
 #ifndef ARDUINOJSON_STRING_BUFFER_SIZE
 #  define ARDUINOJSON_STRING_BUFFER_SIZE 32
 #endif
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp
index 1bfc39392..fd32a55e9 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationError.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationOptions.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationOptions.hpp
index 8400cc0b2..4c73934fc 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationOptions.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/DeserializationOptions.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Filter.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Filter.hpp
index 39883027d..76705560b 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Filter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Filter.hpp
@@ -1,17 +1,24 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
-#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Variant/JsonVariant.hpp>
+#include <ArduinoJson/Variant/VariantAttorney.hpp>
 
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 namespace DeserializationOption {
 class Filter {
  public:
-  explicit Filter(JsonVariantConst v) : variant_(v) {}
+#if ARDUINOJSON_AUTO_SHRINK
+  explicit Filter(JsonDocument& doc) : variant_(doc) {
+    doc.shrinkToFit();
+  }
+#endif
+
+  explicit Filter(JsonVariantConst variant) : variant_(variant) {}
 
   bool allow() const {
     return variant_;
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp
index 6434275be..d30402b4b 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/NestingLimit.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp
index 44437686a..c4b5edb74 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Reader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -19,7 +19,7 @@ struct Reader {
 
   int read() {
     // clang-format off
-    return source_->read();  // Error here? See https://arduinojson.org/v6/invalid-input/
+    return source_->read();  // Error here? See https://arduinojson.org/v7/invalid-input/
     // clang-format on
   }
 
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
index 8a8738858..43c5a432b 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStreamReader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -15,7 +15,7 @@ struct Reader<TSource,
   explicit Reader(Stream& stream) : stream_(&stream) {}
 
   int read() {
-    // don't use stream_.read() as it ignores the timeout
+    // don't use stream_->read() as it ignores the timeout
     char c;
     return stream_->readBytes(&c, 1) ? static_cast<unsigned char>(c) : -1;
   }
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp
index 14491f44a..4730be016 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/ArduinoStringReader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
index 97714afb1..fa8ff23d7 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/FlashReader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp
index c0ca4a771..1ca46c852 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/IteratorReader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp
index eff67bac3..8603bb138 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/RamReader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp
index 41e0c00aa..25ba63645 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/StdStreamReader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp
index b60f1cec8..ddb07b8b2 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/Readers/VariantReader.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp b/lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp
index 9f4d78e85..21d187640 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Deserialization/deserialize.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -8,7 +8,6 @@
 #include <ArduinoJson/Deserialization/DeserializationOptions.hpp>
 #include <ArduinoJson/Deserialization/Reader.hpp>
 #include <ArduinoJson/Polyfills/utility.hpp>
-#include <ArduinoJson/StringStorage/StringStorage.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
@@ -23,44 +22,62 @@ struct first_or_void<T, Rest...> {
   using type = T;
 };
 
-template <template <typename, typename> class TDeserializer, typename TReader,
-          typename TWriter>
-TDeserializer<TReader, TWriter> makeDeserializer(MemoryPool* pool,
-                                                 TReader reader,
-                                                 TWriter writer) {
-  ARDUINOJSON_ASSERT(pool != 0);
-  return TDeserializer<TReader, TWriter>(pool, reader, writer);
+// A meta-function that returns true if T is a valid destination type for
+// deserialize()
+template <class T, class = void>
+struct is_deserialize_destination : false_type {};
+
+template <class T>
+struct is_deserialize_destination<
+    T, typename enable_if<is_same<decltype(VariantAttorney::getResourceManager(
+                                      detail::declval<T&>())),
+                                  ResourceManager*>::value>::type> : true_type {
+};
+
+template <typename TDestination>
+inline void shrinkJsonDocument(TDestination&) {
+  // no-op by default
 }
 
-template <template <typename, typename> class TDeserializer, typename TStream,
-          typename... Args,
+#if ARDUINOJSON_AUTO_SHRINK
+inline void shrinkJsonDocument(JsonDocument& doc) {
+  doc.shrinkToFit();
+}
+#endif
+
+template <template <typename> class TDeserializer, typename TDestination,
+          typename TReader, typename TOptions>
+DeserializationError doDeserialize(TDestination&& dst, TReader reader,
+                                   TOptions options) {
+  auto data = VariantAttorney::getOrCreateData(dst);
+  if (!data)
+    return DeserializationError::NoMemory;
+  auto resources = VariantAttorney::getResourceManager(dst);
+  dst.clear();
+  auto err = TDeserializer<TReader>(resources, reader)
+                 .parse(*data, options.filter, options.nestingLimit);
+  shrinkJsonDocument(dst);
+  return err;
+}
+
+template <template <typename> class TDeserializer, typename TDestination,
+          typename TStream, typename... Args,
           typename = typename enable_if<  // issue #1897
               !is_integral<typename first_or_void<Args...>::type>::value>::type>
-DeserializationError deserialize(JsonDocument& doc, TStream&& input,
+DeserializationError deserialize(TDestination&& dst, TStream&& input,
                                  Args... args) {
-  auto reader = makeReader(detail::forward<TStream>(input));
-  auto data = VariantAttorney::getData(doc);
-  auto pool = VariantAttorney::getPool(doc);
-  auto options = makeDeserializationOptions(args...);
-  doc.clear();
-  return makeDeserializer<TDeserializer>(pool, reader,
-                                         makeStringStorage(input, pool))
-      .parse(*data, options.filter, options.nestingLimit);
+  return doDeserialize<TDeserializer>(
+      dst, makeReader(detail::forward<TStream>(input)),
+      makeDeserializationOptions(args...));
 }
 
-template <template <typename, typename> class TDeserializer, typename TChar,
-          typename Size, typename... Args,
+template <template <typename> class TDeserializer, typename TDestination,
+          typename TChar, typename Size, typename... Args,
           typename = typename enable_if<is_integral<Size>::value>::type>
-DeserializationError deserialize(JsonDocument& doc, TChar* input,
+DeserializationError deserialize(TDestination&& dst, TChar* input,
                                  Size inputSize, Args... args) {
-  auto reader = makeReader(input, size_t(inputSize));
-  auto data = VariantAttorney::getData(doc);
-  auto pool = VariantAttorney::getPool(doc);
-  auto options = makeDeserializationOptions(args...);
-  doc.clear();
-  return makeDeserializer<TDeserializer>(pool, reader,
-                                         makeStringStorage(input, pool))
-      .parse(*data, options.filter, options.nestingLimit);
+  return doDeserialize<TDeserializer>(dst, makeReader(input, size_t(inputSize)),
+                                      makeDeserializationOptions(args...));
 }
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp b/lib/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp
deleted file mode 100644
index bc206f02f..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Document/BasicJsonDocument.hpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Document/JsonDocument.hpp>
-
-ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
-
-// Helper to implement the "base-from-member" idiom
-// (we need to store the allocator before constructing JsonDocument)
-template <typename TAllocator>
-class AllocatorOwner {
- public:
-  AllocatorOwner() {}
-  AllocatorOwner(TAllocator a) : allocator_(a) {}
-
-  void* allocate(size_t size) {
-    return allocator_.allocate(size);
-  }
-
-  void deallocate(void* ptr) {
-    if (ptr)
-      allocator_.deallocate(ptr);
-  }
-
-  void* reallocate(void* ptr, size_t new_size) {
-    return allocator_.reallocate(ptr, new_size);
-  }
-
-  TAllocator& allocator() {
-    return allocator_;
-  }
-
- private:
-  TAllocator allocator_;
-};
-
-// A JsonDocument that uses the provided allocator to allocate its memory pool.
-// https://arduinojson.org/v6/api/basicjsondocument/
-template <typename TAllocator>
-class BasicJsonDocument : AllocatorOwner<TAllocator>, public JsonDocument {
- public:
-  explicit BasicJsonDocument(size_t capa, TAllocator alloc = TAllocator())
-      : AllocatorOwner<TAllocator>(alloc), JsonDocument(allocPool(capa)) {}
-
-  // Copy-constructor
-  BasicJsonDocument(const BasicJsonDocument& src)
-      : AllocatorOwner<TAllocator>(src), JsonDocument() {
-    copyAssignFrom(src);
-  }
-
-  // Move-constructor
-  BasicJsonDocument(BasicJsonDocument&& src) : AllocatorOwner<TAllocator>(src) {
-    moveAssignFrom(src);
-  }
-
-  BasicJsonDocument(const JsonDocument& src) {
-    copyAssignFrom(src);
-  }
-
-  // Construct from variant, array, or object
-  template <typename T>
-  BasicJsonDocument(const T& src,
-                    typename detail::enable_if<
-                        detail::is_same<T, JsonVariant>::value ||
-                        detail::is_same<T, JsonVariantConst>::value ||
-                        detail::is_same<T, JsonArray>::value ||
-                        detail::is_same<T, JsonArrayConst>::value ||
-                        detail::is_same<T, JsonObject>::value ||
-                        detail::is_same<T, JsonObjectConst>::value>::type* = 0)
-      : JsonDocument(allocPool(src.memoryUsage())) {
-    set(src);
-  }
-
-  // disambiguate
-  BasicJsonDocument(JsonVariant src)
-      : JsonDocument(allocPool(src.memoryUsage())) {
-    set(src);
-  }
-
-  ~BasicJsonDocument() {
-    freePool();
-  }
-
-  BasicJsonDocument& operator=(const BasicJsonDocument& src) {
-    copyAssignFrom(src);
-    return *this;
-  }
-
-  BasicJsonDocument& operator=(BasicJsonDocument&& src) {
-    moveAssignFrom(src);
-    return *this;
-  }
-
-  template <typename T>
-  BasicJsonDocument& operator=(const T& src) {
-    size_t requiredSize = src.memoryUsage();
-    if (requiredSize > capacity())
-      reallocPool(requiredSize);
-    set(src);
-    return *this;
-  }
-
-  // Reduces the capacity of the memory pool to match the current usage.
-  // https://arduinojson.org/v6/api/basicjsondocument/shrinktofit/
-  void shrinkToFit() {
-    ptrdiff_t bytes_reclaimed = pool_.squash();
-    if (bytes_reclaimed == 0)
-      return;
-
-    void* old_ptr = pool_.buffer();
-    void* new_ptr = this->reallocate(old_ptr, pool_.capacity());
-
-    ptrdiff_t ptr_offset =
-        static_cast<char*>(new_ptr) - static_cast<char*>(old_ptr);
-
-    pool_.movePointers(ptr_offset);
-    data_.movePointers(ptr_offset, ptr_offset - bytes_reclaimed);
-  }
-
-  // Reclaims the memory leaked when removing and replacing values.
-  // https://arduinojson.org/v6/api/jsondocument/garbagecollect/
-  bool garbageCollect() {
-    // make a temporary clone and move assign
-    BasicJsonDocument tmp(*this);
-    if (!tmp.capacity())
-      return false;
-    moveAssignFrom(tmp);
-    return true;
-  }
-
-  using AllocatorOwner<TAllocator>::allocator;
-
- private:
-  detail::MemoryPool allocPool(size_t requiredSize) {
-    size_t capa = detail::addPadding(requiredSize);
-    return {reinterpret_cast<char*>(this->allocate(capa)), capa};
-  }
-
-  void reallocPool(size_t requiredSize) {
-    size_t capa = detail::addPadding(requiredSize);
-    if (capa == pool_.capacity())
-      return;
-    freePool();
-    replacePool(allocPool(detail::addPadding(requiredSize)));
-  }
-
-  void freePool() {
-    this->deallocate(getPool()->buffer());
-  }
-
-  void copyAssignFrom(const JsonDocument& src) {
-    reallocPool(src.capacity());
-    set(src);
-  }
-
-  void moveAssignFrom(BasicJsonDocument& src) {
-    freePool();
-    data_ = src.data_;
-    pool_ = src.pool_;
-    src.data_.setNull();
-    src.pool_ = {0, 0};
-  }
-};
-
-ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp b/lib/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp
deleted file mode 100644
index 3c2dc3a61..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Document/DynamicJsonDocument.hpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Document/BasicJsonDocument.hpp>
-
-#include <stdlib.h>  // malloc, free
-
-ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
-
-// The allocator of DynamicJsonDocument.
-struct DefaultAllocator {
-  void* allocate(size_t size) {
-    return malloc(size);
-  }
-
-  void deallocate(void* ptr) {
-    free(ptr);
-  }
-
-  void* reallocate(void* ptr, size_t new_size) {
-    return realloc(ptr, new_size);
-  }
-};
-
-// A JsonDocument with a memory pool in the heap.
-// https://arduinojson.org/v6/api/dynamicjsondocument/
-typedef BasicJsonDocument<DefaultAllocator> DynamicJsonDocument;
-
-ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp b/lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp
index 39c1536f1..d2daf97ad 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Document/JsonDocument.hpp
@@ -1,107 +1,142 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Array/ElementProxy.hpp>
-#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Memory/Allocator.hpp>
+#include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/Object/JsonObject.hpp>
 #include <ArduinoJson/Object/MemberProxy.hpp>
-#include <ArduinoJson/Strings/StoragePolicy.hpp>
+#include <ArduinoJson/Polyfills/utility.hpp>
 #include <ArduinoJson/Variant/JsonVariantConst.hpp>
 #include <ArduinoJson/Variant/VariantTo.hpp>
 
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // A JSON document.
-// https://arduinojson.org/v6/api/jsondocument/
+// https://arduinojson.org/v7/api/jsondocument/
 class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
   friend class detail::VariantAttorney;
 
  public:
-  JsonDocument(const JsonDocument&) = delete;
-  JsonDocument& operator=(const JsonDocument&) = delete;
+  explicit JsonDocument(Allocator* alloc = detail::DefaultAllocator::instance())
+      : resources_(alloc) {}
+
+  // Copy-constructor
+  JsonDocument(const JsonDocument& src) : JsonDocument(src.allocator()) {
+    set(src);
+  }
+
+  // Move-constructor
+  JsonDocument(JsonDocument&& src) : JsonDocument() {
+    swap(*this, src);
+  }
+
+  // Construct from variant, array, or object
+  template <typename T>
+  JsonDocument(const T& src,
+               Allocator* alloc = detail::DefaultAllocator::instance(),
+               typename detail::enable_if<
+                   detail::is_same<T, JsonVariant>::value ||
+                   detail::is_same<T, JsonVariantConst>::value ||
+                   detail::is_same<T, JsonArray>::value ||
+                   detail::is_same<T, JsonArrayConst>::value ||
+                   detail::is_same<T, JsonObject>::value ||
+                   detail::is_same<T, JsonObjectConst>::value>::type* = 0)
+      : JsonDocument(alloc) {
+    set(src);
+  }
+
+  JsonDocument& operator=(JsonDocument src) {
+    swap(*this, src);
+    return *this;
+  }
+
+  template <typename T>
+  JsonDocument& operator=(const T& src) {
+    set(src);
+    return *this;
+  }
+
+  Allocator* allocator() const {
+    return resources_.allocator();
+  }
+
+  // Reduces the capacity of the memory pool to match the current usage.
+  // https://arduinojson.org/v7/api/jsondocument/shrinktofit/
+  void shrinkToFit() {
+    resources_.shrinkToFit();
+  }
 
   // Casts the root to the specified type.
-  // https://arduinojson.org/v6/api/jsondocument/as/
+  // https://arduinojson.org/v7/api/jsondocument/as/
   template <typename T>
   T as() {
     return getVariant().template as<T>();
   }
 
   // Casts the root to the specified type.
-  // https://arduinojson.org/v6/api/jsondocument/as/
+  // https://arduinojson.org/v7/api/jsondocument/as/
   template <typename T>
   T as() const {
     return getVariant().template as<T>();
   }
 
   // Empties the document and resets the memory pool
-  // https://arduinojson.org/v6/api/jsondocument/clear/
+  // https://arduinojson.org/v7/api/jsondocument/clear/
   void clear() {
-    pool_.clear();
-    data_.setNull();
+    resources_.clear();
+    data_.reset();
   }
 
   // Returns true if the root is of the specified type.
-  // https://arduinojson.org/v6/api/jsondocument/is/
+  // https://arduinojson.org/v7/api/jsondocument/is/
   template <typename T>
   bool is() {
     return getVariant().template is<T>();
   }
 
   // Returns true if the root is of the specified type.
-  // https://arduinojson.org/v6/api/jsondocument/is/
+  // https://arduinojson.org/v7/api/jsondocument/is/
   template <typename T>
   bool is() const {
     return getVariant().template is<T>();
   }
 
   // Returns true if the root is null.
-  // https://arduinojson.org/v6/api/jsondocument/isnull/
+  // https://arduinojson.org/v7/api/jsondocument/isnull/
   bool isNull() const {
     return getVariant().isNull();
   }
 
-  // Returns the number of used bytes in the memory pool.
-  // https://arduinojson.org/v6/api/jsondocument/memoryusage/
-  size_t memoryUsage() const {
-    return pool_.size();
-  }
-
   // Returns trues if the memory pool was too small.
-  // https://arduinojson.org/v6/api/jsondocument/overflowed/
+  // https://arduinojson.org/v7/api/jsondocument/overflowed/
   bool overflowed() const {
-    return pool_.overflowed();
+    return resources_.overflowed();
   }
 
   // Returns the depth (nesting level) of the array.
-  // https://arduinojson.org/v6/api/jsondocument/nesting/
+  // https://arduinojson.org/v7/api/jsondocument/nesting/
   size_t nesting() const {
-    return variantNesting(&data_);
-  }
-
-  // Returns the capacity of the memory pool.
-  // https://arduinojson.org/v6/api/jsondocument/capacity/
-  size_t capacity() const {
-    return pool_.capacity();
+    return data_.nesting(&resources_);
   }
 
   // Returns the number of elements in the root array or object.
-  // https://arduinojson.org/v6/api/jsondocument/size/
+  // https://arduinojson.org/v7/api/jsondocument/size/
   size_t size() const {
-    return data_.size();
+    return data_.size(&resources_);
   }
 
   // Copies the specified document.
-  // https://arduinojson.org/v6/api/jsondocument/set/
+  // https://arduinojson.org/v7/api/jsondocument/set/
   bool set(const JsonDocument& src) {
     return to<JsonVariant>().set(src.as<JsonVariantConst>());
   }
 
   // Replaces the root with the specified value.
-  // https://arduinojson.org/v6/api/jsondocument/set/
+  // https://arduinojson.org/v7/api/jsondocument/set/
   template <typename T>
   typename detail::enable_if<!detail::is_base_of<JsonDocument, T>::value,
                              bool>::type
@@ -110,69 +145,29 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
   }
 
   // Clears the document and converts it to the specified type.
-  // https://arduinojson.org/v6/api/jsondocument/to/
+  // https://arduinojson.org/v7/api/jsondocument/to/
   template <typename T>
   typename detail::VariantTo<T>::type to() {
     clear();
     return getVariant().template to<T>();
   }
 
-  // Creates an array and appends it to the root array.
-  // https://arduinojson.org/v6/api/jsondocument/createnestedarray/
-  JsonArray createNestedArray() {
-    return add().to<JsonArray>();
-  }
-
-  // Creates an array and adds it to the root object.
-  // https://arduinojson.org/v6/api/jsondocument/createnestedarray/
-  template <typename TChar>
-  JsonArray createNestedArray(TChar* key) {
-    return operator[](key).template to<JsonArray>();
-  }
-
-  // Creates an array and adds it to the root object.
-  // https://arduinojson.org/v6/api/jsondocument/createnestedarray/
-  template <typename TString>
-  JsonArray createNestedArray(const TString& key) {
-    return operator[](key).template to<JsonArray>();
-  }
-
-  // Creates an object and appends it to the root array.
-  // https://arduinojson.org/v6/api/jsondocument/createnestedobject/
-  JsonObject createNestedObject() {
-    return add().to<JsonObject>();
-  }
-
-  // Creates an object and adds it to the root object.
-  // https://arduinojson.org/v6/api/jsondocument/createnestedobject/
-  template <typename TChar>
-  JsonObject createNestedObject(TChar* key) {
-    return operator[](key).template to<JsonObject>();
-  }
-
-  // Creates an object and adds it to the root object.
-  // https://arduinojson.org/v6/api/jsondocument/createnestedobject/
-  template <typename TString>
-  JsonObject createNestedObject(const TString& key) {
-    return operator[](key).template to<JsonObject>();
-  }
-
   // Returns true if the root object contains the specified key.
-  // https://arduinojson.org/v6/api/jsondocument/containskey/
+  // https://arduinojson.org/v7/api/jsondocument/containskey/
   template <typename TChar>
   bool containsKey(TChar* key) const {
-    return data_.getMember(detail::adaptString(key)) != 0;
+    return data_.getMember(detail::adaptString(key), &resources_) != 0;
   }
 
   // Returns true if the root object contains the specified key.
-  // https://arduinojson.org/v6/api/jsondocument/containskey/
+  // https://arduinojson.org/v7/api/jsondocument/containskey/
   template <typename TString>
   bool containsKey(const TString& key) const {
-    return data_.getMember(detail::adaptString(key)) != 0;
+    return data_.getMember(detail::adaptString(key), &resources_) != 0;
   }
 
   // Gets or sets a root object's member.
-  // https://arduinojson.org/v6/api/jsondocument/subscript/
+  // https://arduinojson.org/v7/api/jsondocument/subscript/
   template <typename TString>
   FORCE_INLINE typename detail::enable_if<
       detail::IsString<TString>::value,
@@ -182,7 +177,7 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
   }
 
   // Gets or sets a root object's member.
-  // https://arduinojson.org/v6/api/jsondocument/subscript/
+  // https://arduinojson.org/v7/api/jsondocument/subscript/
   template <typename TChar>
   FORCE_INLINE typename detail::enable_if<
       detail::IsString<TChar*>::value,
@@ -192,80 +187,92 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
   }
 
   // Gets a root object's member.
-  // https://arduinojson.org/v6/api/jsondocument/subscript/
+  // https://arduinojson.org/v7/api/jsondocument/subscript/
   template <typename TString>
   FORCE_INLINE typename detail::enable_if<detail::IsString<TString>::value,
                                           JsonVariantConst>::type
   operator[](const TString& key) const {
-    return JsonVariantConst(data_.getMember(detail::adaptString(key)));
+    return JsonVariantConst(
+        data_.getMember(detail::adaptString(key), &resources_), &resources_);
   }
 
   // Gets a root object's member.
-  // https://arduinojson.org/v6/api/jsondocument/subscript/
+  // https://arduinojson.org/v7/api/jsondocument/subscript/
   template <typename TChar>
   FORCE_INLINE typename detail::enable_if<detail::IsString<TChar*>::value,
                                           JsonVariantConst>::type
   operator[](TChar* key) const {
-    return JsonVariantConst(data_.getMember(detail::adaptString(key)));
+    return JsonVariantConst(
+        data_.getMember(detail::adaptString(key), &resources_), &resources_);
   }
 
   // Gets or sets a root array's element.
-  // https://arduinojson.org/v6/api/jsondocument/subscript/
+  // https://arduinojson.org/v7/api/jsondocument/subscript/
   FORCE_INLINE detail::ElementProxy<JsonDocument&> operator[](size_t index) {
     return {*this, index};
   }
 
   // Gets a root array's member.
-  // https://arduinojson.org/v6/api/jsondocument/subscript/
+  // https://arduinojson.org/v7/api/jsondocument/subscript/
   FORCE_INLINE JsonVariantConst operator[](size_t index) const {
-    return JsonVariantConst(data_.getElement(index));
+    return JsonVariantConst(data_.getElement(index, &resources_), &resources_);
+  }
+
+  // Appends a new (empty) element to the root array.
+  // Returns a reference to the new element.
+  // https://arduinojson.org/v7/api/jsondocument/add/
+  template <typename T>
+  typename detail::enable_if<!detail::is_same<T, JsonVariant>::value, T>::type
+  add() {
+    return add<JsonVariant>().to<T>();
   }
 
   // Appends a new (null) element to the root array.
   // Returns a reference to the new element.
-  // https://arduinojson.org/v6/api/jsondocument/add/
-  FORCE_INLINE JsonVariant add() {
-    return JsonVariant(&pool_, data_.addElement(&pool_));
+  // https://arduinojson.org/v7/api/jsondocument/add/
+  template <typename T>
+  typename detail::enable_if<detail::is_same<T, JsonVariant>::value, T>::type
+  add() {
+    return JsonVariant(data_.addElement(&resources_), &resources_);
   }
 
   // Appends a value to the root array.
-  // https://arduinojson.org/v6/api/jsondocument/add/
+  // https://arduinojson.org/v7/api/jsondocument/add/
   template <typename TValue>
   FORCE_INLINE bool add(const TValue& value) {
-    return add().set(value);
+    return add<JsonVariant>().set(value);
   }
 
   // Appends a value to the root array.
-  // https://arduinojson.org/v6/api/jsondocument/add/
+  // https://arduinojson.org/v7/api/jsondocument/add/
   template <typename TChar>
   FORCE_INLINE bool add(TChar* value) {
-    return add().set(value);
+    return add<JsonVariant>().set(value);
   }
 
   // Removes an element of the root array.
-  // ⚠️ Doesn't release the memory associated with the removed element.
-  // https://arduinojson.org/v6/api/jsondocument/remove/
+  // https://arduinojson.org/v7/api/jsondocument/remove/
   FORCE_INLINE void remove(size_t index) {
-    data_.remove(index);
+    detail::VariantData::removeElement(getData(), index, getResourceManager());
   }
 
   // Removes a member of the root object.
-  // ⚠️ Doesn't release the memory associated with the removed element.
-  // https://arduinojson.org/v6/api/jsondocument/remove/
+  // https://arduinojson.org/v7/api/jsondocument/remove/
   template <typename TChar>
   FORCE_INLINE typename detail::enable_if<detail::IsString<TChar*>::value>::type
   remove(TChar* key) {
-    data_.remove(detail::adaptString(key));
+    detail::VariantData::removeMember(getData(), detail::adaptString(key),
+                                      getResourceManager());
   }
 
   // Removes a member of the root object.
-  // ⚠️ Doesn't release the memory associated with the removed element.
-  // https://arduinojson.org/v6/api/jsondocument/remove/
+  // https://arduinojson.org/v7/api/jsondocument/remove/
   template <typename TString>
   FORCE_INLINE
       typename detail::enable_if<detail::IsString<TString>::value>::type
       remove(const TString& key) {
-    data_.remove(detail::adaptString(key));
+    detail::VariantData::removeMember(getData(), detail::adaptString(key),
+                                      getResourceManager());
   }
 
   FORCE_INLINE operator JsonVariant() {
@@ -276,33 +283,74 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
     return getVariant();
   }
 
- protected:
-  JsonDocument() : pool_(0, 0) {}
-
-  JsonDocument(detail::MemoryPool pool) : pool_(pool) {}
-
-  JsonDocument(char* buf, size_t capa) : pool_(buf, capa) {}
-
-  ~JsonDocument() {}
-
-  void replacePool(detail::MemoryPool pool) {
-    pool_ = pool;
+  friend void swap(JsonDocument& a, JsonDocument& b) {
+    swap(a.resources_, b.resources_);
+    swap_(a.data_, b.data_);
   }
 
+  // DEPRECATED: use add<JsonVariant>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonVariant>() instead")
+  JsonVariant add() {
+    return add<JsonVariant>();
+  }
+
+  // DEPRECATED: use add<JsonArray>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonArray>() instead")
+  JsonArray createNestedArray() {
+    return add<JsonArray>();
+  }
+
+  // DEPRECATED: use doc[key].to<JsonArray>() instead
+  template <typename TChar>
+  ARDUINOJSON_DEPRECATED("use doc[key].to<JsonArray>() instead")
+  JsonArray createNestedArray(TChar* key) {
+    return operator[](key).template to<JsonArray>();
+  }
+
+  // DEPRECATED: use doc[key].to<JsonArray>() instead
+  template <typename TString>
+  ARDUINOJSON_DEPRECATED("use doc[key].to<JsonArray>() instead")
+  JsonArray createNestedArray(const TString& key) {
+    return operator[](key).template to<JsonArray>();
+  }
+
+  // DEPRECATED: use add<JsonObject>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonObject>() instead")
+  JsonObject createNestedObject() {
+    return add<JsonObject>();
+  }
+
+  // DEPRECATED: use doc[key].to<JsonObject>() instead
+  template <typename TChar>
+  ARDUINOJSON_DEPRECATED("use doc[key].to<JsonObject>() instead")
+  JsonObject createNestedObject(TChar* key) {
+    return operator[](key).template to<JsonObject>();
+  }
+
+  // DEPRECATED: use doc[key].to<JsonObject>() instead
+  template <typename TString>
+  ARDUINOJSON_DEPRECATED("use doc[key].to<JsonObject>() instead")
+  JsonObject createNestedObject(const TString& key) {
+    return operator[](key).template to<JsonObject>();
+  }
+
+  // DEPRECATED: always returns zero
+  ARDUINOJSON_DEPRECATED("always returns zero")
+  size_t memoryUsage() const {
+    return 0;
+  }
+
+ private:
   JsonVariant getVariant() {
-    return JsonVariant(&pool_, &data_);
+    return JsonVariant(&data_, &resources_);
   }
 
   JsonVariantConst getVariant() const {
-    return JsonVariantConst(&data_);
+    return JsonVariantConst(&data_, &resources_);
   }
 
-  detail::MemoryPool pool_;
-  detail::VariantData data_;
-
- protected:
-  detail::MemoryPool* getPool() {
-    return &pool_;
+  detail::ResourceManager* getResourceManager() {
+    return &resources_;
   }
 
   detail::VariantData* getData() {
@@ -316,6 +364,9 @@ class JsonDocument : public detail::VariantOperators<const JsonDocument&> {
   detail::VariantData* getOrCreateData() {
     return &data_;
   }
+
+  detail::ResourceManager resources_;
+  detail::VariantData data_;
 };
 
 inline void convertToJson(const JsonDocument& src, JsonVariant dst) {
diff --git a/lib/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp b/lib/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp
deleted file mode 100644
index 071666643..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Document/StaticJsonDocument.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Document/JsonDocument.hpp>
-
-ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
-
-// A JsonDocument with a memory pool on the stack.
-template <size_t desiredCapacity>
-class StaticJsonDocument : public JsonDocument {
-  static const size_t capacity_ =
-      detail::AddPadding<detail::Max<1, desiredCapacity>::value>::value;
-
- public:
-  StaticJsonDocument() : JsonDocument(buffer_, capacity_) {}
-
-  StaticJsonDocument(const StaticJsonDocument& src)
-      : JsonDocument(buffer_, capacity_) {
-    set(src);
-  }
-
-  template <typename T>
-  StaticJsonDocument(
-      const T& src,
-      typename detail::enable_if<
-          detail::is_convertible<T, JsonVariantConst>::value>::type* = 0)
-      : JsonDocument(buffer_, capacity_) {
-    set(src);
-  }
-
-  // disambiguate
-  StaticJsonDocument(JsonVariant src) : JsonDocument(buffer_, capacity_) {
-    set(src);
-  }
-
-  StaticJsonDocument& operator=(const StaticJsonDocument& src) {
-    set(src);
-    return *this;
-  }
-
-  template <typename T>
-  StaticJsonDocument& operator=(const T& src) {
-    set(src);
-    return *this;
-  }
-
-  // Reclaims the memory leaked when removing and replacing values.
-  // https://arduinojson.org/v6/api/jsondocument/garbagecollect/
-  void garbageCollect() {
-    StaticJsonDocument tmp(*this);
-    set(tmp);
-  }
-
- private:
-  char buffer_[capacity_];
-};
-
-ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp
index d2740cc42..e1b7199ee 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Json/EscapeSequence.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp
index a566aea9e..2bcd8cdb0 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Json/JsonDeserializer.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -9,7 +9,7 @@
 #include <ArduinoJson/Json/Latch.hpp>
 #include <ArduinoJson/Json/Utf16.hpp>
 #include <ArduinoJson/Json/Utf8.hpp>
-#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/Numbers/parseNumber.hpp>
 #include <ArduinoJson/Polyfills/assert.hpp>
 #include <ArduinoJson/Polyfills/type_traits.hpp>
@@ -18,15 +18,14 @@
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
-template <typename TReader, typename TStringStorage>
+template <typename TReader>
 class JsonDeserializer {
  public:
-  JsonDeserializer(MemoryPool* pool, TReader reader,
-                   TStringStorage stringStorage)
-      : stringStorage_(stringStorage),
+  JsonDeserializer(ResourceManager* resources, TReader reader)
+      : stringBuilder_(resources),
         foundSomething_(false),
         latch_(reader),
-        pool_(pool) {}
+        resources_(resources) {}
 
   template <typename TFilter>
   DeserializationError parse(VariantData& variant, TFilter filter,
@@ -35,7 +34,7 @@ class JsonDeserializer {
 
     err = parseVariant(variant, filter, nestingLimit);
 
-    if (!err && latch_.last() != 0 && !variant.isEnclosed()) {
+    if (!err && latch_.last() != 0 && variant.isFloat()) {
       // We don't detect trailing characters earlier, so we need to check now
       return DeserializationError::InvalidInput;
     }
@@ -147,7 +146,7 @@ class JsonDeserializer {
 
   template <typename TFilter>
   DeserializationError::Code parseArray(
-      CollectionData& array, TFilter filter,
+      ArrayData& array, TFilter filter,
       DeserializationOption::NestingLimit nestingLimit) {
     DeserializationError::Code err;
 
@@ -167,18 +166,18 @@ class JsonDeserializer {
     if (eat(']'))
       return DeserializationError::Ok;
 
-    TFilter memberFilter = filter[0UL];
+    TFilter elementFilter = filter[0UL];
 
     // Read each value
     for (;;) {
-      if (memberFilter.allow()) {
+      if (elementFilter.allow()) {
         // Allocate slot in array
-        VariantData* value = array.addElement(pool_);
+        VariantData* value = array.addElement(resources_);
         if (!value)
           return DeserializationError::NoMemory;
 
         // 1 - Parse value
-        err = parseVariant(*value, memberFilter, nestingLimit.decrement());
+        err = parseVariant(*value, elementFilter, nestingLimit.decrement());
         if (err)
           return err;
       } else {
@@ -233,7 +232,7 @@ class JsonDeserializer {
 
   template <typename TFilter>
   DeserializationError::Code parseObject(
-      CollectionData& object, TFilter filter,
+      ObjectData& object, TFilter filter,
       DeserializationOption::NestingLimit nestingLimit) {
     DeserializationError::Code err;
 
@@ -269,29 +268,26 @@ class JsonDeserializer {
       if (!eat(':'))
         return DeserializationError::InvalidInput;
 
-      JsonString key = stringStorage_.str();
+      JsonString key = stringBuilder_.str();
 
       TFilter memberFilter = filter[key.c_str()];
 
       if (memberFilter.allow()) {
-        VariantData* variant = object.getMember(adaptString(key.c_str()));
-        if (!variant) {
+        auto member = object.getMember(adaptString(key.c_str()), resources_);
+        if (!member) {
           // Save key in memory pool.
-          // This MUST be done before adding the slot.
-          key = stringStorage_.save();
+          auto savedKey = stringBuilder_.save();
 
           // Allocate slot in object
-          VariantSlot* slot = object.addSlot(pool_);
-          if (!slot)
+          member = object.addMember(savedKey, resources_);
+          if (!member)
             return DeserializationError::NoMemory;
-
-          slot->setKey(key);
-
-          variant = slot->data();
+        } else {
+          member->setNull(resources_);
         }
 
         // Parse value
-        err = parseVariant(*variant, memberFilter, nestingLimit.decrement());
+        err = parseVariant(*member, memberFilter, nestingLimit.decrement());
         if (err)
           return err;
       } else {
@@ -377,7 +373,7 @@ class JsonDeserializer {
   }
 
   DeserializationError::Code parseKey() {
-    stringStorage_.startString();
+    stringBuilder_.startString();
     if (isQuote(current())) {
       return parseQuotedString();
     } else {
@@ -388,13 +384,13 @@ class JsonDeserializer {
   DeserializationError::Code parseStringValue(VariantData& variant) {
     DeserializationError::Code err;
 
-    stringStorage_.startString();
+    stringBuilder_.startString();
 
     err = parseQuotedString();
     if (err)
       return err;
 
-    variant.setString(stringStorage_.save());
+    variant.setOwnedString(stringBuilder_.save());
 
     return DeserializationError::Ok;
   }
@@ -430,9 +426,9 @@ class JsonDeserializer {
           if (err)
             return err;
           if (codepoint.append(codeunit))
-            Utf8::encodeCodepoint(codepoint.value(), stringStorage_);
+            Utf8::encodeCodepoint(codepoint.value(), stringBuilder_);
 #else
-          stringStorage_.append('\\');
+          stringBuilder_.append('\\');
 #endif
           continue;
         }
@@ -444,10 +440,10 @@ class JsonDeserializer {
         move();
       }
 
-      stringStorage_.append(c);
+      stringBuilder_.append(c);
     }
 
-    if (!stringStorage_.isValid())
+    if (!stringBuilder_.isValid())
       return DeserializationError::NoMemory;
 
     return DeserializationError::Ok;
@@ -460,14 +456,14 @@ class JsonDeserializer {
     if (canBeInNonQuotedString(c)) {  // no quotes
       do {
         move();
-        stringStorage_.append(c);
+        stringBuilder_.append(c);
         c = current();
       } while (canBeInNonQuotedString(c));
     } else {
       return DeserializationError::InvalidInput;
     }
 
-    if (!stringStorage_.isValid())
+    if (!stringBuilder_.isValid())
       return DeserializationError::NoMemory;
 
     return DeserializationError::Ok;
@@ -659,10 +655,10 @@ class JsonDeserializer {
     return DeserializationError::Ok;
   }
 
-  TStringStorage stringStorage_;
+  StringBuilder stringBuilder_;
   bool foundSomething_;
   Latch<TReader> latch_;
-  MemoryPool* pool_;
+  ResourceManager* resources_;
   char buffer_[64];  // using a member instead of a local variable because it
                      // ended in the recursive path after compiler inlined the
                      // code
@@ -673,21 +669,27 @@ ARDUINOJSON_END_PRIVATE_NAMESPACE
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // Parses a JSON input, filters, and puts the result in a JsonDocument.
-// https://arduinojson.org/v6/api/json/deserializejson/
-template <typename... Args>
-DeserializationError deserializeJson(JsonDocument& doc, Args&&... args) {
+// https://arduinojson.org/v7/api/json/deserializejson/
+template <typename TDestination, typename... Args>
+typename detail::enable_if<
+    detail::is_deserialize_destination<TDestination>::value,
+    DeserializationError>::type
+deserializeJson(TDestination&& dst, Args&&... args) {
   using namespace detail;
-  return deserialize<JsonDeserializer>(doc, detail::forward<Args>(args)...);
-}
-
-// Parses a JSON input, filters, and puts the result in a JsonDocument.
-// https://arduinojson.org/v6/api/json/deserializejson/
-template <typename TChar, typename... Args>
-DeserializationError deserializeJson(JsonDocument& doc, TChar* input,
-                                     Args&&... args) {
-  using namespace detail;
-  return deserialize<JsonDeserializer>(doc, input,
+  return deserialize<JsonDeserializer>(detail::forward<TDestination>(dst),
                                        detail::forward<Args>(args)...);
 }
 
+// Parses a JSON input, filters, and puts the result in a JsonDocument.
+// https://arduinojson.org/v7/api/json/deserializejson/
+template <typename TDestination, typename TChar, typename... Args>
+typename detail::enable_if<
+    detail::is_deserialize_destination<TDestination>::value,
+    DeserializationError>::type
+deserializeJson(TDestination&& dst, TChar* input, Args&&... args) {
+  using namespace detail;
+  return deserialize<JsonDeserializer>(detail::forward<TDestination>(dst),
+                                       input, detail::forward<Args>(args)...);
+}
+
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp
index 781c9c935..f4751f0c2 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Json/JsonSerializer.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -7,27 +7,28 @@
 #include <ArduinoJson/Json/TextFormatter.hpp>
 #include <ArduinoJson/Serialization/measure.hpp>
 #include <ArduinoJson/Serialization/serialize.hpp>
-#include <ArduinoJson/Variant/Visitor.hpp>
+#include <ArduinoJson/Variant/VariantDataVisitor.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 template <typename TWriter>
-class JsonSerializer : public Visitor<size_t> {
+class JsonSerializer : public VariantDataVisitor<size_t> {
  public:
   static const bool producesText = true;
 
-  JsonSerializer(TWriter writer) : formatter_(writer) {}
+  JsonSerializer(TWriter writer, const ResourceManager* resources)
+      : formatter_(writer), resources_(resources) {}
 
-  FORCE_INLINE size_t visitArray(const CollectionData& array) {
+  FORCE_INLINE size_t visit(const ArrayData& array) {
     write('[');
 
-    const VariantSlot* slot = array.head();
+    auto it = array.createIterator(resources_);
 
-    while (slot != 0) {
-      slot->data()->accept(*this);
+    while (!it.done()) {
+      it->accept(*this);
 
-      slot = slot->next();
-      if (slot == 0)
+      it.next(resources_);
+      if (it.done())
         break;
 
       write(',');
@@ -37,18 +38,18 @@ class JsonSerializer : public Visitor<size_t> {
     return bytesWritten();
   }
 
-  size_t visitObject(const CollectionData& object) {
+  size_t visit(const ObjectData& object) {
     write('{');
 
-    const VariantSlot* slot = object.head();
+    auto it = object.createIterator(resources_);
 
-    while (slot != 0) {
-      formatter_.writeString(slot->key());
+    while (!it.done()) {
+      formatter_.writeString(it.key());
       write(':');
-      slot->data()->accept(*this);
+      it->accept(*this);
 
-      slot = slot->next();
-      if (slot == 0)
+      it.next(resources_);
+      if (it.done())
         break;
 
       write(',');
@@ -58,42 +59,42 @@ class JsonSerializer : public Visitor<size_t> {
     return bytesWritten();
   }
 
-  size_t visitFloat(JsonFloat value) {
+  size_t visit(JsonFloat value) {
     formatter_.writeFloat(value);
     return bytesWritten();
   }
 
-  size_t visitString(const char* value) {
+  size_t visit(const char* value) {
     formatter_.writeString(value);
     return bytesWritten();
   }
 
-  size_t visitString(const char* value, size_t n) {
-    formatter_.writeString(value, n);
+  size_t visit(JsonString value) {
+    formatter_.writeString(value.c_str(), value.size());
     return bytesWritten();
   }
 
-  size_t visitRawJson(const char* data, size_t n) {
-    formatter_.writeRaw(data, n);
+  size_t visit(RawString value) {
+    formatter_.writeRaw(value.data(), value.size());
     return bytesWritten();
   }
 
-  size_t visitSignedInteger(JsonInteger value) {
+  size_t visit(JsonInteger value) {
     formatter_.writeInteger(value);
     return bytesWritten();
   }
 
-  size_t visitUnsignedInteger(JsonUInt value) {
+  size_t visit(JsonUInt value) {
     formatter_.writeInteger(value);
     return bytesWritten();
   }
 
-  size_t visitBoolean(bool value) {
+  size_t visit(bool value) {
     formatter_.writeBoolean(value);
     return bytesWritten();
   }
 
-  size_t visitNull() {
+  size_t visit(nullptr_t) {
     formatter_.writeRaw("null");
     return bytesWritten();
   }
@@ -113,6 +114,9 @@ class JsonSerializer : public Visitor<size_t> {
 
  private:
   TextFormatter<TWriter> formatter_;
+
+ protected:
+  const ResourceManager* resources_;
 };
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
@@ -120,7 +124,7 @@ ARDUINOJSON_END_PRIVATE_NAMESPACE
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // Produces a minified JSON document.
-// https://arduinojson.org/v6/api/json/serializejson/
+// https://arduinojson.org/v7/api/json/serializejson/
 template <typename TDestination>
 size_t serializeJson(JsonVariantConst source, TDestination& destination) {
   using namespace detail;
@@ -128,7 +132,7 @@ size_t serializeJson(JsonVariantConst source, TDestination& destination) {
 }
 
 // Produces a minified JSON document.
-// https://arduinojson.org/v6/api/json/serializejson/
+// https://arduinojson.org/v7/api/json/serializejson/
 inline size_t serializeJson(JsonVariantConst source, void* buffer,
                             size_t bufferSize) {
   using namespace detail;
@@ -136,7 +140,7 @@ inline size_t serializeJson(JsonVariantConst source, void* buffer,
 }
 
 // Computes the length of the document that serializeJson() produces.
-// https://arduinojson.org/v6/api/json/measurejson/
+// https://arduinojson.org/v7/api/json/measurejson/
 inline size_t measureJson(JsonVariantConst source) {
   using namespace detail;
   return measure<JsonSerializer>(source);
diff --git a/lib/ArduinoJson/src/ArduinoJson/Json/Latch.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/Latch.hpp
index 08070eb3f..f9d9e5104 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Json/Latch.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Json/Latch.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp
index e8a920642..ab049ad6f 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Json/PrettyJsonSerializer.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -16,19 +16,20 @@ class PrettyJsonSerializer : public JsonSerializer<TWriter> {
   typedef JsonSerializer<TWriter> base;
 
  public:
-  PrettyJsonSerializer(TWriter writer) : base(writer), nesting_(0) {}
+  PrettyJsonSerializer(TWriter writer, const ResourceManager* resources)
+      : base(writer, resources), nesting_(0) {}
 
-  size_t visitArray(const CollectionData& array) {
-    const VariantSlot* slot = array.head();
-    if (slot) {
+  size_t visit(const ArrayData& array) {
+    auto it = array.createIterator(base::resources_);
+    if (!it.done()) {
       base::write("[\r\n");
       nesting_++;
-      while (slot != 0) {
+      while (!it.done()) {
         indent();
-        slot->data()->accept(*this);
+        it->accept(*this);
 
-        slot = slot->next();
-        base::write(slot ? ",\r\n" : "\r\n");
+        it.next(base::resources_);
+        base::write(it.done() ? "\r\n" : ",\r\n");
       }
       nesting_--;
       indent();
@@ -39,19 +40,19 @@ class PrettyJsonSerializer : public JsonSerializer<TWriter> {
     return this->bytesWritten();
   }
 
-  size_t visitObject(const CollectionData& object) {
-    const VariantSlot* slot = object.head();
-    if (slot) {
+  size_t visit(const ObjectData& object) {
+    auto it = object.createIterator(base::resources_);
+    if (!it.done()) {
       base::write("{\r\n");
       nesting_++;
-      while (slot != 0) {
+      while (!it.done()) {
         indent();
-        base::visitString(slot->key());
+        base::visit(it.key());
         base::write(": ");
-        slot->data()->accept(*this);
+        it->accept(*this);
 
-        slot = slot->next();
-        base::write(slot ? ",\r\n" : "\r\n");
+        it.next(base::resources_);
+        base::write(it.done() ? "\r\n" : ",\r\n");
       }
       nesting_--;
       indent();
@@ -62,6 +63,8 @@ class PrettyJsonSerializer : public JsonSerializer<TWriter> {
     return this->bytesWritten();
   }
 
+  using base::visit;
+
  private:
   void indent() {
     for (uint8_t i = 0; i < nesting_; i++)
@@ -76,7 +79,7 @@ ARDUINOJSON_END_PRIVATE_NAMESPACE
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // Produces JsonDocument to create a prettified JSON document.
-// https://arduinojson.org/v6/api/json/serializejsonpretty/
+// https://arduinojson.org/v7/api/json/serializejsonpretty/
 template <typename TDestination>
 size_t serializeJsonPretty(JsonVariantConst source, TDestination& destination) {
   using namespace ArduinoJson::detail;
@@ -84,7 +87,7 @@ size_t serializeJsonPretty(JsonVariantConst source, TDestination& destination) {
 }
 
 // Produces JsonDocument to create a prettified JSON document.
-// https://arduinojson.org/v6/api/json/serializejsonpretty/
+// https://arduinojson.org/v7/api/json/serializejsonpretty/
 inline size_t serializeJsonPretty(JsonVariantConst source, void* buffer,
                                   size_t bufferSize) {
   using namespace ArduinoJson::detail;
@@ -92,7 +95,7 @@ inline size_t serializeJsonPretty(JsonVariantConst source, void* buffer,
 }
 
 // Computes the length of the document that serializeJsonPretty() produces.
-// https://arduinojson.org/v6/api/json/measurejsonpretty/
+// https://arduinojson.org/v7/api/json/measurejsonpretty/
 inline size_t measureJsonPretty(JsonVariantConst source) {
   using namespace ArduinoJson::detail;
   return measure<PrettyJsonSerializer>(source);
diff --git a/lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp
index f8eb2822c..b68233d50 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Json/TextFormatter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp
index 6e314db28..2111451aa 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Json/Utf16.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp b/lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp
index 1e33c186c..ad659b5a1 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Json/Utf8.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp
index 61b8654e7..65d60695b 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/Alignment.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/Allocator.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/Allocator.hpp
new file mode 100644
index 000000000..aadc3686c
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/Allocator.hpp
@@ -0,0 +1,49 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Namespace.hpp>
+
+#include <stdlib.h>  // malloc, free
+
+ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
+
+class Allocator {
+ public:
+  virtual void* allocate(size_t size) = 0;
+  virtual void deallocate(void* ptr) = 0;
+  virtual void* reallocate(void* ptr, size_t new_size) = 0;
+
+ protected:
+  ~Allocator() = default;
+};
+
+namespace detail {
+class DefaultAllocator : public Allocator {
+ public:
+  void* allocate(size_t size) override {
+    return malloc(size);
+  }
+
+  void deallocate(void* ptr) override {
+    free(ptr);
+  }
+
+  void* reallocate(void* ptr, size_t new_size) override {
+    return realloc(ptr, new_size);
+  }
+
+  static Allocator* instance() {
+    static DefaultAllocator allocator;
+    return &allocator;
+  }
+
+ private:
+  DefaultAllocator() = default;
+  ~DefaultAllocator() = default;
+};
+}  // namespace detail
+
+ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp
deleted file mode 100644
index 754d58513..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Memory/MemoryPool.hpp
+++ /dev/null
@@ -1,253 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Memory/Alignment.hpp>
-#include <ArduinoJson/Polyfills/assert.hpp>
-#include <ArduinoJson/Polyfills/mpl/max.hpp>
-#include <ArduinoJson/Strings/StringAdapters.hpp>
-#include <ArduinoJson/Variant/VariantSlot.hpp>
-
-#include <string.h>  // memmove
-
-#define JSON_STRING_SIZE(SIZE) (SIZE + 1)
-
-// Computes the size required to store an array in a JsonDocument.
-// https://arduinojson.org/v6/how-to/determine-the-capacity-of-the-jsondocument/
-#define JSON_ARRAY_SIZE(NUMBER_OF_ELEMENTS) \
-  ((NUMBER_OF_ELEMENTS) * sizeof(ArduinoJson::detail::VariantSlot))
-
-// Returns the size (in bytes) of an object with n elements.
-// Can be very handy to determine the size of a StaticMemoryPool.
-#define JSON_OBJECT_SIZE(NUMBER_OF_ELEMENTS) \
-  ((NUMBER_OF_ELEMENTS) * sizeof(ArduinoJson::detail::VariantSlot))
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-// begin_                                   end_
-// v                                           v
-// +-------------+--------------+--------------+
-// | strings...  |   (free)     |  ...variants |
-// +-------------+--------------+--------------+
-//               ^              ^
-//             left_          right_
-
-class MemoryPool {
- public:
-  MemoryPool(char* buf, size_t capa)
-      : begin_(buf),
-        left_(buf),
-        right_(buf ? buf + capa : 0),
-        end_(buf ? buf + capa : 0),
-        overflowed_(false) {
-    ARDUINOJSON_ASSERT(isAligned(begin_));
-    ARDUINOJSON_ASSERT(isAligned(right_));
-    ARDUINOJSON_ASSERT(isAligned(end_));
-  }
-
-  void* buffer() {
-    return begin_;  // NOLINT(clang-analyzer-unix.Malloc)
-                    // movePointers() alters this pointer
-  }
-
-  // Gets the capacity of the memoryPool in bytes
-  size_t capacity() const {
-    return size_t(end_ - begin_);
-  }
-
-  size_t size() const {
-    return size_t(left_ - begin_ + end_ - right_);
-  }
-
-  bool overflowed() const {
-    return overflowed_;
-  }
-
-  VariantSlot* allocVariant() {
-    return allocRight<VariantSlot>();
-  }
-
-  template <typename TAdaptedString>
-  const char* saveString(TAdaptedString str) {
-    if (str.isNull())
-      return 0;
-
-#if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
-    const char* existingCopy = findString(str);
-    if (existingCopy)
-      return existingCopy;
-#endif
-
-    size_t n = str.size();
-
-    char* newCopy = allocString(n + 1);
-    if (newCopy) {
-      stringGetChars(str, newCopy, n);
-      newCopy[n] = 0;  // force null-terminator
-    }
-    return newCopy;
-  }
-
-  void getFreeZone(char** zoneStart, size_t* zoneSize) const {
-    *zoneStart = left_;
-    *zoneSize = size_t(right_ - left_);
-  }
-
-  const char* saveStringFromFreeZone(size_t len) {
-#if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
-    const char* dup = findString(adaptString(left_, len));
-    if (dup)
-      return dup;
-#endif
-
-    const char* str = left_;
-    left_ += len;
-    *left_++ = 0;
-    checkInvariants();
-    return str;
-  }
-
-  void markAsOverflowed() {
-    overflowed_ = true;
-  }
-
-  void clear() {
-    left_ = begin_;
-    right_ = end_;
-    overflowed_ = false;
-  }
-
-  bool canAlloc(size_t bytes) const {
-    return left_ + bytes <= right_;
-  }
-
-  bool owns(void* p) const {
-    return begin_ <= p && p < end_;
-  }
-
-  // Workaround for missing placement new
-  void* operator new(size_t, void* p) {
-    return p;
-  }
-
-  // Squash the free space between strings and variants
-  //
-  // begin_                    end_
-  // v                            v
-  // +-------------+--------------+
-  // | strings...  |  ...variants |
-  // +-------------+--------------+
-  //               ^
-  //          left_ right_
-  //
-  // This funcion is called before a realloc.
-  ptrdiff_t squash() {
-    char* new_right = addPadding(left_);
-    if (new_right >= right_)
-      return 0;
-
-    size_t right_size = static_cast<size_t>(end_ - right_);
-    memmove(new_right, right_, right_size);
-
-    ptrdiff_t bytes_reclaimed = right_ - new_right;
-    right_ = new_right;
-    end_ = new_right + right_size;
-    return bytes_reclaimed;
-  }
-
-  // Move all pointers together
-  // This funcion is called after a realloc.
-  void movePointers(ptrdiff_t offset) {
-    begin_ += offset;
-    left_ += offset;
-    right_ += offset;
-    end_ += offset;
-  }
-
- private:
-  void checkInvariants() {
-    ARDUINOJSON_ASSERT(begin_ <= left_);
-    ARDUINOJSON_ASSERT(left_ <= right_);
-    ARDUINOJSON_ASSERT(right_ <= end_);
-    ARDUINOJSON_ASSERT(isAligned(right_));
-  }
-
-#if ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
-  template <typename TAdaptedString>
-  const char* findString(const TAdaptedString& str) const {
-    size_t n = str.size();
-    for (char* next = begin_; next + n < left_; ++next) {
-      if (next[n] == '\0' && stringEquals(str, adaptString(next, n)))
-        return next;
-
-      // jump to next terminator
-      while (*next)
-        ++next;
-    }
-    return 0;
-  }
-#endif
-
-  char* allocString(size_t n) {
-    if (!canAlloc(n)) {
-      overflowed_ = true;
-      return 0;
-    }
-    char* s = left_;
-    left_ += n;
-    checkInvariants();
-    return s;
-  }
-
-  template <typename T>
-  T* allocRight() {
-    return reinterpret_cast<T*>(allocRight(sizeof(T)));
-  }
-
-  void* allocRight(size_t bytes) {
-    if (!canAlloc(bytes)) {
-      overflowed_ = true;
-      return 0;
-    }
-    right_ -= bytes;
-    return right_;
-  }
-
-  char *begin_, *left_, *right_, *end_;
-  bool overflowed_;
-};
-
-template <typename TAdaptedString, typename TCallback>
-bool storeString(MemoryPool* pool, TAdaptedString str,
-                 StringStoragePolicy::Copy, TCallback callback) {
-  const char* copy = pool->saveString(str);
-  JsonString storedString(copy, str.size(), JsonString::Copied);
-  callback(storedString);
-  return copy != 0;
-}
-
-template <typename TAdaptedString, typename TCallback>
-bool storeString(MemoryPool*, TAdaptedString str, StringStoragePolicy::Link,
-                 TCallback callback) {
-  JsonString storedString(str.data(), str.size(), JsonString::Linked);
-  callback(storedString);
-  return !str.isNull();
-}
-
-template <typename TAdaptedString, typename TCallback>
-bool storeString(MemoryPool* pool, TAdaptedString str,
-                 StringStoragePolicy::LinkOrCopy policy, TCallback callback) {
-  if (policy.link)
-    return storeString(pool, str, StringStoragePolicy::Link(), callback);
-  else
-    return storeString(pool, str, StringStoragePolicy::Copy(), callback);
-}
-
-template <typename TAdaptedString, typename TCallback>
-bool storeString(MemoryPool* pool, TAdaptedString str, TCallback callback) {
-  return storeString(pool, str, str.storagePolicy(), callback);
-}
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/ResourceManager.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/ResourceManager.hpp
new file mode 100644
index 000000000..9a8cee840
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/ResourceManager.hpp
@@ -0,0 +1,127 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/Allocator.hpp>
+#include <ArduinoJson/Memory/StringPool.hpp>
+#include <ArduinoJson/Memory/VariantPoolList.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/utility.hpp>
+#include <ArduinoJson/Strings/StringAdapters.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+class VariantSlot;
+class VariantPool;
+
+class ResourceManager {
+ public:
+  ResourceManager(Allocator* allocator = DefaultAllocator::instance())
+      : allocator_(allocator), overflowed_(false) {}
+
+  ~ResourceManager() {
+    stringPool_.clear(allocator_);
+    variantPools_.clear(allocator_);
+  }
+
+  ResourceManager(const ResourceManager&) = delete;
+  ResourceManager& operator=(const ResourceManager& src) = delete;
+
+  friend void swap(ResourceManager& a, ResourceManager& b) {
+    swap(a.stringPool_, b.stringPool_);
+    swap(a.variantPools_, b.variantPools_);
+    swap_(a.allocator_, b.allocator_);
+    swap_(a.overflowed_, b.overflowed_);
+  }
+
+  Allocator* allocator() const {
+    return allocator_;
+  }
+
+  size_t size() const {
+    return VariantPool::slotsToBytes(variantPools_.usage()) +
+           stringPool_.size();
+  }
+
+  bool overflowed() const {
+    return overflowed_;
+  }
+
+  SlotWithId allocSlot() {
+    auto p = variantPools_.allocSlot(allocator_);
+    if (!p)
+      overflowed_ = true;
+    return p;
+  }
+
+  void freeSlot(SlotWithId id) {
+    variantPools_.freeSlot(id);
+  }
+
+  VariantSlot* getSlot(SlotId id) const {
+    return variantPools_.getSlot(id);
+  }
+
+  template <typename TAdaptedString>
+  StringNode* saveString(TAdaptedString str) {
+    if (str.isNull())
+      return 0;
+
+    auto node = stringPool_.add(str, allocator_);
+    if (!node)
+      overflowed_ = true;
+
+    return node;
+  }
+
+  void saveString(StringNode* node) {
+    stringPool_.add(node);
+  }
+
+  template <typename TAdaptedString>
+  StringNode* getString(const TAdaptedString& str) const {
+    return stringPool_.get(str);
+  }
+
+  StringNode* createString(size_t length) {
+    auto node = StringNode::create(length, allocator_);
+    if (!node)
+      overflowed_ = true;
+    return node;
+  }
+
+  StringNode* resizeString(StringNode* node, size_t length) {
+    node = StringNode::resize(node, length, allocator_);
+    if (!node)
+      overflowed_ = true;
+    return node;
+  }
+
+  void destroyString(StringNode* node) {
+    StringNode::destroy(node, allocator_);
+  }
+
+  void dereferenceString(const char* s) {
+    stringPool_.dereference(s, allocator_);
+  }
+
+  void clear() {
+    variantPools_.clear(allocator_);
+    overflowed_ = false;
+    stringPool_.clear(allocator_);
+  }
+
+  void shrinkToFit() {
+    variantPools_.shrinkToFit(allocator_);
+  }
+
+ private:
+  Allocator* allocator_;
+  bool overflowed_;
+  StringPool stringPool_;
+  VariantPoolList variantPools_;
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/StringBuilder.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/StringBuilder.hpp
new file mode 100644
index 000000000..f3a842aca
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/StringBuilder.hpp
@@ -0,0 +1,80 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/ResourceManager.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+class StringBuilder {
+ public:
+  static const size_t initialCapacity = 31;
+
+  StringBuilder(ResourceManager* resources) : resources_(resources) {}
+
+  ~StringBuilder() {
+    if (node_)
+      resources_->destroyString(node_);
+  }
+
+  void startString() {
+    size_ = 0;
+    if (!node_)
+      node_ = resources_->createString(initialCapacity);
+  }
+
+  StringNode* save() {
+    ARDUINOJSON_ASSERT(node_ != nullptr);
+    node_->data[size_] = 0;
+    StringNode* node = resources_->getString(adaptString(node_->data, size_));
+    if (!node) {
+      node = resources_->resizeString(node_, size_);
+      ARDUINOJSON_ASSERT(node != nullptr);  // realloc to smaller can't fail
+      resources_->saveString(node);
+      node_ = nullptr;  // next time we need a new string
+    } else {
+      node->references++;
+    }
+    return node;
+  }
+
+  void append(const char* s) {
+    while (*s)
+      append(*s++);
+  }
+
+  void append(const char* s, size_t n) {
+    while (n-- > 0)  // TODO: memcpy
+      append(*s++);
+  }
+
+  void append(char c) {
+    if (node_ && size_ == node_->length)
+      node_ = resources_->resizeString(node_, size_ * 2U + 1);
+    if (node_)
+      node_->data[size_++] = c;
+  }
+
+  bool isValid() const {
+    return node_ != nullptr;
+  }
+
+  size_t size() const {
+    return size_;
+  }
+
+  JsonString str() const {
+    ARDUINOJSON_ASSERT(node_ != nullptr);
+    node_->data[size_] = 0;
+    return JsonString(node_->data, size_, JsonString::Copied);
+  }
+
+ private:
+  ResourceManager* resources_;
+  StringNode* node_ = nullptr;
+  size_t size_ = 0;
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/StringNode.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/StringNode.hpp
new file mode 100644
index 000000000..b2699f03d
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/StringNode.hpp
@@ -0,0 +1,73 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/Allocator.hpp>
+#include <ArduinoJson/Namespace.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/integer.hpp>
+#include <ArduinoJson/Polyfills/limits.hpp>
+
+#include <stddef.h>  // offsetof
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+struct StringNode {
+  // Use the same type as SlotId to store the reference count
+  // (there can never be more references than slots)
+  using references_type = uint_t<ARDUINOJSON_SLOT_ID_SIZE * 8>::type;
+
+  using length_type = uint_t<ARDUINOJSON_STRING_LENGTH_SIZE * 8>::type;
+
+  struct StringNode* next;
+  references_type references;
+  length_type length;
+  char data[1];
+
+  static constexpr size_t maxLength = numeric_limits<length_type>::highest();
+
+  static constexpr size_t sizeForLength(size_t n) {
+    return n + 1 + offsetof(StringNode, data);
+  }
+
+  static StringNode* create(size_t length, Allocator* allocator) {
+    if (length > maxLength)
+      return nullptr;
+    auto node = reinterpret_cast<StringNode*>(
+        allocator->allocate(sizeForLength(length)));
+    if (node) {
+      node->length = length_type(length);
+      node->references = 1;
+    }
+    return node;
+  }
+
+  static StringNode* resize(StringNode* node, size_t length,
+                            Allocator* allocator) {
+    ARDUINOJSON_ASSERT(node != nullptr);
+    StringNode* newNode;
+    if (length <= maxLength)
+      newNode = reinterpret_cast<StringNode*>(
+          allocator->reallocate(node, sizeForLength(length)));
+    else
+      newNode = nullptr;
+    if (newNode)
+      newNode->length = length_type(length);
+    else
+      allocator->deallocate(node);
+    return newNode;
+  }
+
+  static void destroy(StringNode* node, Allocator* allocator) {
+    allocator->deallocate(node);
+  }
+};
+
+// Returns the size (in bytes) of an string with n characters.
+constexpr size_t sizeofString(size_t n) {
+  return StringNode::sizeForLength(n);
+}
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/StringPool.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/StringPool.hpp
new file mode 100644
index 000000000..dcdc98b6d
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/StringPool.hpp
@@ -0,0 +1,105 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/Allocator.hpp>
+#include <ArduinoJson/Memory/StringNode.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/utility.hpp>
+#include <ArduinoJson/Strings/StringAdapters.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+class VariantSlot;
+class VariantPool;
+
+class StringPool {
+ public:
+  StringPool() = default;
+  StringPool(const StringPool&) = delete;
+  void operator=(StringPool&& src) = delete;
+
+  ~StringPool() {
+    ARDUINOJSON_ASSERT(strings_ == nullptr);
+  }
+
+  friend void swap(StringPool& a, StringPool& b) {
+    swap_(a.strings_, b.strings_);
+  }
+
+  void clear(Allocator* allocator) {
+    while (strings_) {
+      auto node = strings_;
+      strings_ = node->next;
+      StringNode::destroy(node, allocator);
+    }
+  }
+
+  size_t size() const {
+    size_t total = 0;
+    for (auto node = strings_; node; node = node->next)
+      total += sizeofString(node->length);
+    return total;
+  }
+
+  template <typename TAdaptedString>
+  StringNode* add(TAdaptedString str, Allocator* allocator) {
+    ARDUINOJSON_ASSERT(str.isNull() == false);
+
+    auto node = get(str);
+    if (node) {
+      node->references++;
+      return node;
+    }
+
+    size_t n = str.size();
+
+    node = StringNode::create(n, allocator);
+    if (!node)
+      return nullptr;
+
+    stringGetChars(str, node->data, n);
+    node->data[n] = 0;  // force NUL terminator
+    add(node);
+    return node;
+  }
+
+  void add(StringNode* node) {
+    ARDUINOJSON_ASSERT(node != nullptr);
+    node->next = strings_;
+    strings_ = node;
+  }
+
+  template <typename TAdaptedString>
+  StringNode* get(const TAdaptedString& str) const {
+    for (auto node = strings_; node; node = node->next) {
+      if (stringEquals(str, adaptString(node->data, node->length)))
+        return node;
+    }
+    return nullptr;
+  }
+
+  void dereference(const char* s, Allocator* allocator) {
+    StringNode* prev = nullptr;
+    for (auto node = strings_; node; node = node->next) {
+      if (node->data == s) {
+        if (--node->references == 0) {
+          if (prev)
+            prev->next = node->next;
+          else
+            strings_ = node->next;
+          StringNode::destroy(node, allocator);
+        }
+        return;
+      }
+      prev = node;
+    }
+  }
+
+ private:
+  StringNode* strings_ = nullptr;
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPool.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPool.hpp
new file mode 100644
index 000000000..b0e4af3b5
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPool.hpp
@@ -0,0 +1,63 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/ResourceManager.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+#include <ArduinoJson/Polyfills/integer.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+class VariantSlot;
+using SlotId = uint_t<ARDUINOJSON_SLOT_ID_SIZE * 8>::type;
+using SlotCount = SlotId;
+const SlotId NULL_SLOT = SlotId(-1);
+
+class SlotWithId {
+ public:
+  SlotWithId() : slot_(nullptr), id_(NULL_SLOT) {}
+  SlotWithId(VariantSlot* slot, SlotId id) : slot_(slot), id_(id) {
+    ARDUINOJSON_ASSERT((slot == nullptr) == (id == NULL_SLOT));
+  }
+
+  SlotId id() const {
+    return id_;
+  }
+
+  operator VariantSlot*() {
+    return slot_;
+  }
+
+  VariantSlot* operator->() {
+    ARDUINOJSON_ASSERT(slot_ != nullptr);
+    return slot_;
+  }
+
+ private:
+  VariantSlot* slot_;
+  SlotId id_;
+};
+
+class VariantPool {
+ public:
+  void create(SlotCount cap, Allocator* allocator);
+  void destroy(Allocator* allocator);
+
+  SlotWithId allocSlot();
+  VariantSlot* getSlot(SlotId id) const;
+  void clear();
+  void shrinkToFit(Allocator*);
+  SlotCount usage() const;
+
+  static SlotCount bytesToSlots(size_t);
+  static size_t slotsToBytes(SlotCount);
+
+ private:
+  SlotCount capacity_;
+  SlotCount usage_;
+  VariantSlot* slots_;
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPoolImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPoolImpl.hpp
new file mode 100644
index 000000000..d53be32dd
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPoolImpl.hpp
@@ -0,0 +1,81 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/VariantPool.hpp>
+#include <ArduinoJson/Variant/VariantSlot.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+inline void VariantPool::create(SlotCount cap, Allocator* allocator) {
+  ARDUINOJSON_ASSERT(cap > 0);
+  slots_ =
+      reinterpret_cast<VariantSlot*>(allocator->allocate(slotsToBytes(cap)));
+  capacity_ = slots_ ? cap : 0;
+  usage_ = 0;
+}
+
+inline void VariantPool::destroy(Allocator* allocator) {
+  if (slots_)
+    allocator->deallocate(slots_);
+  slots_ = nullptr;
+  capacity_ = 0;
+  usage_ = 0;
+}
+
+inline void VariantPool::shrinkToFit(Allocator* allocator) {
+  auto newSlots = reinterpret_cast<VariantSlot*>(
+      allocator->reallocate(slots_, slotsToBytes(usage_)));
+  if (newSlots) {
+    slots_ = newSlots;
+    capacity_ = usage_;
+  }
+}
+
+inline SlotWithId VariantPool::allocSlot() {
+  if (!slots_)
+    return {};
+  if (usage_ >= capacity_)
+    return {};
+  auto index = usage_++;
+  auto slot = &slots_[index];
+  return {new (slot) VariantSlot, SlotId(index)};
+}
+
+inline VariantSlot* VariantPool::getSlot(SlotId id) const {
+  ARDUINOJSON_ASSERT(id < usage_);
+  return &slots_[id];
+}
+
+inline SlotCount VariantPool::usage() const {
+  return usage_;
+}
+
+inline void VariantPool::clear() {
+  usage_ = 0;
+}
+
+inline SlotCount VariantPool::bytesToSlots(size_t n) {
+  return static_cast<SlotCount>(n / sizeof(VariantSlot));
+}
+
+inline size_t VariantPool::slotsToBytes(SlotCount n) {
+  return n * sizeof(VariantSlot);
+}
+
+inline SlotWithId VariantPoolList::allocFromFreeList() {
+  ARDUINOJSON_ASSERT(freeList_ != NULL_SLOT);
+  auto id = freeList_;
+  auto slot = getSlot(freeList_);
+  freeList_ = slot->next();
+  return {new (slot) VariantSlot, id};
+}
+
+inline void VariantPoolList::freeSlot(SlotWithId slot) {
+  slot->setNext(freeList_);
+  freeList_ = slot.id();
+}
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPoolList.hpp b/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPoolList.hpp
new file mode 100644
index 000000000..8ee5cef68
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Memory/VariantPoolList.hpp
@@ -0,0 +1,189 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Memory/VariantPool.hpp>
+#include <ArduinoJson/Polyfills/assert.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+using PoolCount = SlotId;
+
+class VariantPoolList {
+ public:
+  VariantPoolList() = default;
+
+  ~VariantPoolList() {
+    ARDUINOJSON_ASSERT(count_ == 0);
+  }
+
+  friend void swap(VariantPoolList& a, VariantPoolList& b) {
+    bool aUsedPreallocated = a.pools_ == a.preallocatedPools_;
+    bool bUsedPreallocated = b.pools_ == b.preallocatedPools_;
+
+    // Who is using preallocated pools?
+    if (aUsedPreallocated && bUsedPreallocated) {
+      // both of us => swap preallocated pools
+      for (PoolCount i = 0; i < ARDUINOJSON_INITIAL_POOL_COUNT; i++)
+        swap_(a.preallocatedPools_[i], b.preallocatedPools_[i]);
+    } else if (bUsedPreallocated) {
+      // only b => copy b's preallocated pools and give him a's pointer
+      for (PoolCount i = 0; i < b.count_; i++)
+        a.preallocatedPools_[i] = b.preallocatedPools_[i];
+      b.pools_ = a.pools_;
+      a.pools_ = a.preallocatedPools_;
+    } else if (aUsedPreallocated) {
+      // only a => copy a's preallocated pools and give him b's pointer
+      for (PoolCount i = 0; i < a.count_; i++)
+        b.preallocatedPools_[i] = a.preallocatedPools_[i];
+      a.pools_ = b.pools_;
+      b.pools_ = b.preallocatedPools_;
+    } else {
+      // neither => swap pointers
+      swap_(a.pools_, b.pools_);
+    }
+
+    swap_(a.count_, b.count_);
+    swap_(a.capacity_, b.capacity_);
+    swap_(a.freeList_, b.freeList_);
+  }
+
+  VariantPoolList& operator=(VariantPoolList&& src) {
+    ARDUINOJSON_ASSERT(count_ == 0);
+    if (src.pools_ == src.preallocatedPools_) {
+      memcpy(preallocatedPools_, src.preallocatedPools_,
+             sizeof(preallocatedPools_));
+      pools_ = preallocatedPools_;
+    } else {
+      pools_ = src.pools_;
+      src.pools_ = nullptr;
+    }
+    count_ = src.count_;
+    capacity_ = src.capacity_;
+    src.count_ = 0;
+    src.capacity_ = 0;
+    return *this;
+  }
+
+  SlotWithId allocSlot(Allocator* allocator) {
+    // try to allocate from free list
+    if (freeList_ != NULL_SLOT) {
+      return allocFromFreeList();
+    }
+
+    // try to allocate from last pool (other pools are full)
+    if (count_) {
+      auto slot = allocFromLastPool();
+      if (slot)
+        return slot;
+    }
+
+    // create a new pool and try again
+    auto pool = addPool(allocator);
+    if (!pool)
+      return {};
+
+    return allocFromLastPool();
+  }
+
+  void freeSlot(SlotWithId slot);
+
+  VariantSlot* getSlot(SlotId id) const {
+    if (id == NULL_SLOT)
+      return nullptr;
+    auto poolIndex = SlotId(id / ARDUINOJSON_POOL_CAPACITY);
+    auto indexInPool = SlotId(id % ARDUINOJSON_POOL_CAPACITY);
+    ARDUINOJSON_ASSERT(poolIndex < count_);
+    return pools_[poolIndex].getSlot(indexInPool);
+  }
+
+  void clear(Allocator* allocator) {
+    for (PoolCount i = 0; i < count_; i++)
+      pools_[i].destroy(allocator);
+    count_ = 0;
+    freeList_ = NULL_SLOT;
+    if (pools_ != preallocatedPools_) {
+      allocator->deallocate(pools_);
+      pools_ = preallocatedPools_;
+      capacity_ = ARDUINOJSON_INITIAL_POOL_COUNT;
+    }
+  }
+
+  SlotCount usage() const {
+    SlotCount total = 0;
+    for (PoolCount i = 0; i < count_; i++)
+      total = SlotCount(total + pools_[i].usage());
+    return total;
+  }
+
+  void shrinkToFit(Allocator* allocator) {
+    if (count_ > 0)
+      pools_[count_ - 1].shrinkToFit(allocator);
+    if (pools_ != preallocatedPools_ && count_ != capacity_) {
+      pools_ = static_cast<VariantPool*>(
+          allocator->reallocate(pools_, count_ * sizeof(VariantPool)));
+      ARDUINOJSON_ASSERT(pools_ != nullptr);  // realloc to smaller can't fail
+      capacity_ = count_;
+    }
+  }
+
+ private:
+  SlotWithId allocFromFreeList();
+
+  SlotWithId allocFromLastPool() {
+    ARDUINOJSON_ASSERT(count_ > 0);
+    auto poolIndex = SlotId(count_ - 1);
+    auto slot = pools_[poolIndex].allocSlot();
+    if (!slot)
+      return {};
+    return {slot, SlotId(poolIndex * ARDUINOJSON_POOL_CAPACITY + slot.id())};
+  }
+
+  VariantPool* addPool(Allocator* allocator) {
+    if (count_ == capacity_ && !increaseCapacity(allocator))
+      return nullptr;
+    auto pool = &pools_[count_++];
+    SlotCount poolCapacity = ARDUINOJSON_POOL_CAPACITY;
+    if (count_ == maxPools)  // last pool is smaller because of NULL_SLOT
+      poolCapacity--;
+    pool->create(poolCapacity, allocator);
+    return pool;
+  }
+
+  bool increaseCapacity(Allocator* allocator) {
+    if (capacity_ == maxPools)
+      return false;
+    void* newPools;
+    auto newCapacity = PoolCount(capacity_ * 2);
+
+    if (pools_ == preallocatedPools_) {
+      newPools = allocator->allocate(newCapacity * sizeof(VariantPool));
+      if (!newPools)
+        return false;
+      memcpy(newPools, preallocatedPools_, sizeof(preallocatedPools_));
+    } else {
+      newPools =
+          allocator->reallocate(pools_, newCapacity * sizeof(VariantPool));
+      if (!newPools)
+        return false;
+    }
+
+    pools_ = static_cast<VariantPool*>(newPools);
+    capacity_ = newCapacity;
+    return true;
+  }
+
+  VariantPool preallocatedPools_[ARDUINOJSON_INITIAL_POOL_COUNT];
+  VariantPool* pools_ = preallocatedPools_;
+  PoolCount count_ = 0;
+  PoolCount capacity_ = ARDUINOJSON_INITIAL_POOL_COUNT;
+  SlotId freeList_ = NULL_SLOT;
+
+ public:
+  static const PoolCount maxPools =
+      PoolCount(NULL_SLOT / ARDUINOJSON_POOL_CAPACITY + 1);
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp b/lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp
index ae9abd3c3..d3cb3d34e 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Misc/SerializedValue.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -51,6 +51,8 @@ class SerializedValue<TChar*> {
   size_t size_;
 };
 
+using RawString = SerializedValue<const char*>;
+
 template <typename T>
 inline SerializedValue<T> serialized(T str) {
   return SerializedValue<T>(str);
diff --git a/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp b/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
index 41934295b..faf8a6724 100644
--- a/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackDeserializer.hpp
@@ -1,11 +1,11 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Deserialization/deserialize.hpp>
-#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/MsgPack/endianess.hpp>
 #include <ArduinoJson/MsgPack/ieee754.hpp>
 #include <ArduinoJson/Polyfills/type_traits.hpp>
@@ -13,14 +13,13 @@
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
-template <typename TReader, typename TStringStorage>
+template <typename TReader>
 class MsgPackDeserializer {
  public:
-  MsgPackDeserializer(MemoryPool* pool, TReader reader,
-                      TStringStorage stringStorage)
-      : pool_(pool),
+  MsgPackDeserializer(ResourceManager* resources, TReader reader)
+      : resources_(resources),
         reader_(reader),
-        stringStorage_(stringStorage),
+        stringBuilder_(resources),
         foundSomething_(false) {}
 
   template <typename TFilter>
@@ -371,14 +370,14 @@ class MsgPackDeserializer {
     if (err)
       return err;
 
-    variant->setString(stringStorage_.save());
+    variant->setOwnedString(stringBuilder_.save());
     return DeserializationError::Ok;
   }
 
   DeserializationError::Code readString(size_t n) {
     DeserializationError::Code err;
 
-    stringStorage_.startString();
+    stringBuilder_.startString();
     for (; n; --n) {
       uint8_t c;
 
@@ -386,10 +385,10 @@ class MsgPackDeserializer {
       if (err)
         return err;
 
-      stringStorage_.append(static_cast<char>(c));
+      stringBuilder_.append(static_cast<char>(c));
     }
 
-    if (!stringStorage_.isValid())
+    if (!stringBuilder_.isValid())
       return DeserializationError::NoMemory;
 
     return DeserializationError::Ok;
@@ -420,7 +419,7 @@ class MsgPackDeserializer {
 
     bool allowArray = filter.allowArray();
 
-    CollectionData* array;
+    ArrayData* array;
     if (allowArray) {
       ARDUINOJSON_ASSERT(variant != 0);
       array = &variant->toArray();
@@ -428,21 +427,21 @@ class MsgPackDeserializer {
       array = 0;
     }
 
-    TFilter memberFilter = filter[0U];
+    TFilter elementFilter = filter[0U];
 
     for (; n; --n) {
       VariantData* value;
 
-      if (memberFilter.allow()) {
+      if (elementFilter.allow()) {
         ARDUINOJSON_ASSERT(array != 0);
-        value = array->addElement(pool_);
+        value = array->addElement(resources_);
         if (!value)
           return DeserializationError::NoMemory;
       } else {
         value = 0;
       }
 
-      err = parseVariant(value, memberFilter, nestingLimit.decrement());
+      err = parseVariant(value, elementFilter, nestingLimit.decrement());
       if (err)
         return err;
     }
@@ -473,7 +472,7 @@ class MsgPackDeserializer {
     if (nestingLimit.reached())
       return DeserializationError::TooDeep;
 
-    CollectionData* object;
+    ObjectData* object;
     if (filter.allowObject()) {
       ARDUINOJSON_ASSERT(variant != 0);
       object = &variant->toObject();
@@ -486,7 +485,7 @@ class MsgPackDeserializer {
       if (err)
         return err;
 
-      JsonString key = stringStorage_.str();
+      JsonString key = stringBuilder_.str();
       TFilter memberFilter = filter[key.c_str()];
       VariantData* member;
 
@@ -494,16 +493,11 @@ class MsgPackDeserializer {
         ARDUINOJSON_ASSERT(object != 0);
 
         // Save key in memory pool.
-        // This MUST be done before adding the slot.
-        key = stringStorage_.save();
+        auto savedKey = stringBuilder_.save();
 
-        VariantSlot* slot = object->addSlot(pool_);
-        if (!slot)
+        member = object->addMember(savedKey, resources_);
+        if (!member)
           return DeserializationError::NoMemory;
-
-        slot->setKey(key);
-
-        member = slot->data();
       } else {
         member = 0;
       }
@@ -554,9 +548,9 @@ class MsgPackDeserializer {
     return skipBytes(size + 1U);
   }
 
-  MemoryPool* pool_;
+  ResourceManager* resources_;
   TReader reader_;
-  TStringStorage stringStorage_;
+  StringBuilder stringBuilder_;
   bool foundSomething_;
 };
 
@@ -565,20 +559,27 @@ ARDUINOJSON_END_PRIVATE_NAMESPACE
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // Parses a MessagePack input and puts the result in a JsonDocument.
-// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
-template <typename... Args>
-DeserializationError deserializeMsgPack(JsonDocument& doc, Args&&... args) {
+// https://arduinojson.org/v7/api/msgpack/deserializemsgpack/
+template <typename TDestination, typename... Args>
+typename detail::enable_if<
+    detail::is_deserialize_destination<TDestination>::value,
+    DeserializationError>::type
+deserializeMsgPack(TDestination&& dst, Args&&... args) {
   using namespace detail;
-  return deserialize<MsgPackDeserializer>(doc, detail::forward<Args>(args)...);
+  return deserialize<MsgPackDeserializer>(detail::forward<TDestination>(dst),
+                                          detail::forward<Args>(args)...);
 }
 
 // Parses a MessagePack input and puts the result in a JsonDocument.
-// https://arduinojson.org/v6/api/msgpack/deserializemsgpack/
-template <typename TChar, typename... Args>
-DeserializationError deserializeMsgPack(JsonDocument& doc, TChar* input,
-                                        Args&&... args) {
+// https://arduinojson.org/v7/api/msgpack/deserializemsgpack/
+template <typename TDestination, typename TChar, typename... Args>
+typename detail::enable_if<
+    detail::is_deserialize_destination<TDestination>::value,
+    DeserializationError>::type
+deserializeMsgPack(TDestination&& dst, TChar* input, Args&&... args) {
   using namespace detail;
-  return deserialize<MsgPackDeserializer>(doc, input,
+  return deserialize<MsgPackDeserializer>(detail::forward<TDestination>(dst),
+                                          input,
                                           detail::forward<Args>(args)...);
 }
 
diff --git a/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp b/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
index 6125330c2..5c3fc24ea 100644
--- a/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/MsgPack/MsgPackSerializer.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -15,18 +15,21 @@
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 template <typename TWriter>
-class MsgPackSerializer : public Visitor<size_t> {
+class MsgPackSerializer : public VariantDataVisitor<size_t> {
  public:
   static const bool producesText = false;
 
-  MsgPackSerializer(TWriter writer) : writer_(writer) {}
+  MsgPackSerializer(TWriter writer, const ResourceManager* resources)
+      : writer_(writer), resources_(resources) {}
 
   template <typename T>
-  typename enable_if<sizeof(T) == 4, size_t>::type visitFloat(T value32) {
+  typename enable_if<is_floating_point<T>::value && sizeof(T) == 4,
+                     size_t>::type
+  visit(T value32) {
     if (canConvertNumber<JsonInteger>(value32)) {
       JsonInteger truncatedValue = JsonInteger(value32);
       if (value32 == T(truncatedValue))
-        return visitSignedInteger(truncatedValue);
+        return visit(truncatedValue);
     }
     writeByte(0xCA);
     writeInteger(value32);
@@ -35,17 +38,18 @@ class MsgPackSerializer : public Visitor<size_t> {
 
   template <typename T>
   ARDUINOJSON_NO_SANITIZE("float-cast-overflow")
-  typename enable_if<sizeof(T) == 8, size_t>::type visitFloat(T value64) {
+  typename enable_if<is_floating_point<T>::value && sizeof(T) == 8,
+                     size_t>::type visit(T value64) {
     float value32 = float(value64);
     if (value32 == value64)
-      return visitFloat(value32);
+      return visit(value32);
     writeByte(0xCB);
     writeInteger(value64);
     return bytesWritten();
   }
 
-  size_t visitArray(const CollectionData& array) {
-    size_t n = array.size();
+  size_t visit(const ArrayData& array) {
+    size_t n = array.size(resources_);
     if (n < 0x10) {
       writeByte(uint8_t(0x90 + n));
     } else if (n < 0x10000) {
@@ -55,14 +59,15 @@ class MsgPackSerializer : public Visitor<size_t> {
       writeByte(0xDD);
       writeInteger(uint32_t(n));
     }
-    for (const VariantSlot* slot = array.head(); slot; slot = slot->next()) {
-      slot->data()->accept(*this);
+    for (auto it = array.createIterator(resources_); !it.done();
+         it.next(resources_)) {
+      it->accept(*this);
     }
     return bytesWritten();
   }
 
-  size_t visitObject(const CollectionData& object) {
-    size_t n = object.size();
+  size_t visit(const ObjectData& object) {
+    size_t n = object.size(resources_);
     if (n < 0x10) {
       writeByte(uint8_t(0x80 + n));
     } else if (n < 0x10000) {
@@ -72,20 +77,23 @@ class MsgPackSerializer : public Visitor<size_t> {
       writeByte(0xDF);
       writeInteger(uint32_t(n));
     }
-    for (const VariantSlot* slot = object.head(); slot; slot = slot->next()) {
-      visitString(slot->key());
-      slot->data()->accept(*this);
+    for (auto it = object.createIterator(resources_); !it.done();
+         it.next(resources_)) {
+      visit(it.key());
+      it->accept(*this);
     }
     return bytesWritten();
   }
 
-  size_t visitString(const char* value) {
-    return visitString(value, strlen(value));
+  size_t visit(const char* value) {
+    return visit(JsonString(value));
   }
 
-  size_t visitString(const char* value, size_t n) {
+  size_t visit(JsonString value) {
     ARDUINOJSON_ASSERT(value != NULL);
 
+    auto n = value.size();
+
     if (n < 0x20) {
       writeByte(uint8_t(0xA0 + n));
     } else if (n < 0x100) {
@@ -98,18 +106,18 @@ class MsgPackSerializer : public Visitor<size_t> {
       writeByte(0xDB);
       writeInteger(uint32_t(n));
     }
-    writeBytes(reinterpret_cast<const uint8_t*>(value), n);
+    writeBytes(reinterpret_cast<const uint8_t*>(value.c_str()), n);
     return bytesWritten();
   }
 
-  size_t visitRawJson(const char* data, size_t size) {
-    writeBytes(reinterpret_cast<const uint8_t*>(data), size);
+  size_t visit(RawString value) {
+    writeBytes(reinterpret_cast<const uint8_t*>(value.data()), value.size());
     return bytesWritten();
   }
 
-  size_t visitSignedInteger(JsonInteger value) {
+  size_t visit(JsonInteger value) {
     if (value > 0) {
-      visitUnsignedInteger(static_cast<JsonUInt>(value));
+      visit(static_cast<JsonUInt>(value));
     } else if (value >= -0x20) {
       writeInteger(int8_t(value));
     } else if (value >= -0x80) {
@@ -137,7 +145,7 @@ class MsgPackSerializer : public Visitor<size_t> {
     return bytesWritten();
   }
 
-  size_t visitUnsignedInteger(JsonUInt value) {
+  size_t visit(JsonUInt value) {
     if (value <= 0x7F) {
       writeInteger(uint8_t(value));
     } else if (value <= 0xFF) {
@@ -165,12 +173,12 @@ class MsgPackSerializer : public Visitor<size_t> {
     return bytesWritten();
   }
 
-  size_t visitBoolean(bool value) {
+  size_t visit(bool value) {
     writeByte(value ? 0xC3 : 0xC2);
     return bytesWritten();
   }
 
-  size_t visitNull() {
+  size_t visit(nullptr_t) {
     writeByte(0xC0);
     return bytesWritten();
   }
@@ -195,6 +203,7 @@ class MsgPackSerializer : public Visitor<size_t> {
   }
 
   CountingDecorator<TWriter> writer_;
+  const ResourceManager* resources_;
 };
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
@@ -202,7 +211,7 @@ ARDUINOJSON_END_PRIVATE_NAMESPACE
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // Produces a MessagePack document.
-// https://arduinojson.org/v6/api/msgpack/serializemsgpack/
+// https://arduinojson.org/v7/api/msgpack/serializemsgpack/
 template <typename TDestination>
 inline size_t serializeMsgPack(JsonVariantConst source, TDestination& output) {
   using namespace ArduinoJson::detail;
@@ -210,7 +219,7 @@ inline size_t serializeMsgPack(JsonVariantConst source, TDestination& output) {
 }
 
 // Produces a MessagePack document.
-// https://arduinojson.org/v6/api/msgpack/serializemsgpack/
+// https://arduinojson.org/v7/api/msgpack/serializemsgpack/
 inline size_t serializeMsgPack(JsonVariantConst source, void* output,
                                size_t size) {
   using namespace ArduinoJson::detail;
@@ -218,7 +227,7 @@ inline size_t serializeMsgPack(JsonVariantConst source, void* output,
 }
 
 // Computes the length of the document that serializeMsgPack() produces.
-// https://arduinojson.org/v6/api/msgpack/measuremsgpack/
+// https://arduinojson.org/v7/api/msgpack/measuremsgpack/
 inline size_t measureMsgPack(JsonVariantConst source) {
   using namespace ArduinoJson::detail;
   return measure<MsgPackSerializer>(source);
diff --git a/lib/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp b/lib/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp
index bb2dadd31..1491e39f1 100644
--- a/lib/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/MsgPack/endianess.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp b/lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp
index 8513d493c..427a23a93 100644
--- a/lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/MsgPack/ieee754.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Namespace.hpp b/lib/ArduinoJson/src/ArduinoJson/Namespace.hpp
index 7cce17480..40e005f7f 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Namespace.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Namespace.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -10,16 +10,16 @@
 
 #ifndef ARDUINOJSON_VERSION_NAMESPACE
 
-#  define ARDUINOJSON_VERSION_NAMESPACE                                       \
-    ARDUINOJSON_CONCAT4(                                                      \
-        ARDUINOJSON_VERSION_MACRO,                                            \
-        ARDUINOJSON_BIN2ALPHA(                                                \
-            ARDUINOJSON_ENABLE_PROGMEM, ARDUINOJSON_USE_LONG_LONG,            \
-            ARDUINOJSON_USE_DOUBLE, ARDUINOJSON_ENABLE_STRING_DEDUPLICATION), \
-        ARDUINOJSON_BIN2ALPHA(                                                \
-            ARDUINOJSON_ENABLE_NAN, ARDUINOJSON_ENABLE_INFINITY,              \
-            ARDUINOJSON_ENABLE_COMMENTS, ARDUINOJSON_DECODE_UNICODE),         \
-        ARDUINOJSON_SLOT_OFFSET_SIZE)
+#  define ARDUINOJSON_VERSION_NAMESPACE                                    \
+    ARDUINOJSON_CONCAT4(ARDUINOJSON_VERSION_MACRO,                         \
+                        ARDUINOJSON_BIN2ALPHA(ARDUINOJSON_ENABLE_PROGMEM,  \
+                                              ARDUINOJSON_USE_LONG_LONG,   \
+                                              ARDUINOJSON_USE_DOUBLE, 1),  \
+                        ARDUINOJSON_BIN2ALPHA(ARDUINOJSON_ENABLE_NAN,      \
+                                              ARDUINOJSON_ENABLE_INFINITY, \
+                                              ARDUINOJSON_ENABLE_COMMENTS, \
+                                              ARDUINOJSON_DECODE_UNICODE), \
+                        ARDUINOJSON_SLOT_ID_SIZE)
 
 #endif
 
diff --git a/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp
index 214bc7a8d..0a39a7c67 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatParts.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp
index 23abd7fff..d1df9becd 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Numbers/FloatTraits.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonFloat.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonFloat.hpp
index a1259d07a..89f3351b4 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonFloat.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonFloat.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonInteger.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonInteger.hpp
index 910056536..ae025b725 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonInteger.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Numbers/JsonInteger.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -25,4 +25,4 @@ ARDUINOJSON_END_PUBLIC_NAMESPACE
   static_assert(sizeof(T) <= sizeof(ArduinoJson::JsonInteger),           \
                 "To use 64-bit integers with ArduinoJson, you must set " \
                 "ARDUINOJSON_USE_LONG_LONG to 1. See "                   \
-                "https://arduinojson.org/v6/api/config/use_long_long/");
+                "https://arduinojson.org/v7/api/config/use_long_long/");
diff --git a/lib/ArduinoJson/src/ArduinoJson/Numbers/arithmeticCompare.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/arithmeticCompare.hpp
index e706fd94d..cb2907b5c 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Numbers/arithmeticCompare.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Numbers/arithmeticCompare.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp
index 4fbf8655d..65ad7297c 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Numbers/convertNumber.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp b/lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp
index 4cec1a69e..461fff484 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Numbers/parseNumber.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -147,6 +147,6 @@ template <typename T>
 inline T parseNumber(const char* s) {
   VariantData value;
   parseNumber(s, value);
-  return Converter<T>::fromJson(JsonVariantConst(&value));
+  return Converter<T>::fromJson(JsonVariantConst(&value, nullptr));
 }
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Object/JsonObject.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/JsonObject.hpp
index 7cdc1c76e..096afa87b 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Object/JsonObject.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Object/JsonObject.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -12,7 +12,7 @@ ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 class JsonArray;
 
 // A reference to an object in a JsonDocument.
-// https://arduinojson.org/v6/api/jsonobject/
+// https://arduinojson.org/v7/api/jsonobject/
 class JsonObject : public detail::VariantOperators<JsonObject> {
   friend class detail::VariantAttorney;
 
@@ -20,93 +20,88 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   typedef JsonObjectIterator iterator;
 
   // Creates an unbound reference.
-  FORCE_INLINE JsonObject() : data_(0), pool_(0) {}
+  FORCE_INLINE JsonObject() : data_(0), resources_(0) {}
 
   // INTERNAL USE ONLY
-  FORCE_INLINE JsonObject(detail::MemoryPool* buf, detail::CollectionData* data)
-      : data_(data), pool_(buf) {}
+  FORCE_INLINE JsonObject(detail::ObjectData* data,
+                          detail::ResourceManager* resource)
+      : data_(data), resources_(resource) {}
 
   operator JsonVariant() const {
     void* data = data_;  // prevent warning cast-align
-    return JsonVariant(pool_, reinterpret_cast<detail::VariantData*>(data));
+    return JsonVariant(reinterpret_cast<detail::VariantData*>(data),
+                       resources_);
   }
 
   operator JsonObjectConst() const {
-    return JsonObjectConst(data_);
+    return JsonObjectConst(data_, resources_);
   }
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(collectionToVariant(data_));
+    return JsonVariantConst(collectionToVariant(data_), resources_);
   }
 
   // Returns true if the reference is unbound.
-  // https://arduinojson.org/v6/api/jsonobject/isnull/
+  // https://arduinojson.org/v7/api/jsonobject/isnull/
   FORCE_INLINE bool isNull() const {
     return data_ == 0;
   }
 
   // Returns true if the reference is bound.
-  // https://arduinojson.org/v6/api/jsonobject/isnull/
+  // https://arduinojson.org/v7/api/jsonobject/isnull/
   FORCE_INLINE operator bool() const {
     return data_ != 0;
   }
 
-  // Returns the number of bytes occupied by the object.
-  // https://arduinojson.org/v6/api/jsonobject/memoryusage/
-  FORCE_INLINE size_t memoryUsage() const {
-    return data_ ? data_->memoryUsage() : 0;
-  }
-
   // Returns the depth (nesting level) of the object.
-  // https://arduinojson.org/v6/api/jsonobject/nesting/
+  // https://arduinojson.org/v7/api/jsonobject/nesting/
   FORCE_INLINE size_t nesting() const {
-    return variantNesting(collectionToVariant(data_));
+    return detail::VariantData::nesting(collectionToVariant(data_), resources_);
   }
 
   // Returns the number of members in the object.
-  // https://arduinojson.org/v6/api/jsonobject/size/
+  // https://arduinojson.org/v7/api/jsonobject/size/
   FORCE_INLINE size_t size() const {
-    return data_ ? data_->size() : 0;
+    return data_ ? data_->size(resources_) : 0;
   }
 
   // Returns an iterator to the first key-value pair of the object.
-  // https://arduinojson.org/v6/api/jsonobject/begin/
+  // https://arduinojson.org/v7/api/jsonobject/begin/
   FORCE_INLINE iterator begin() const {
     if (!data_)
       return iterator();
-    return iterator(pool_, data_->head());
+    return iterator(data_->createIterator(resources_), resources_);
   }
 
   // Returns an iterator following the last key-value pair of the object.
-  // https://arduinojson.org/v6/api/jsonobject/end/
+  // https://arduinojson.org/v7/api/jsonobject/end/
   FORCE_INLINE iterator end() const {
     return iterator();
   }
 
   // Removes all the members of the object.
-  // ⚠️ Doesn't release the memory associated with the removed members.
-  // https://arduinojson.org/v6/api/jsonobject/clear/
+  // https://arduinojson.org/v7/api/jsonobject/clear/
   void clear() const {
-    if (!data_)
-      return;
-    data_->clear();
+    detail::ObjectData::clear(data_, resources_);
   }
 
   // Copies an object.
-  // https://arduinojson.org/v6/api/jsonobject/set/
+  // https://arduinojson.org/v7/api/jsonobject/set/
   FORCE_INLINE bool set(JsonObjectConst src) {
     if (!data_ || !src.data_)
       return false;
-    return data_->copyFrom(*src.data_, pool_);
-  }
 
-  // Compares the content of two objects.
-  FORCE_INLINE bool operator==(JsonObject rhs) const {
-    return JsonObjectConst(data_) == JsonObjectConst(rhs.data_);
+    clear();
+    for (auto kvp : src) {
+      if (!operator[](kvp.key()).set(kvp.value()))
+        return false;
+    }
+
+    return true;
   }
 
   // Gets or sets the member with specified key.
-  // https://arduinojson.org/v6/api/jsonobject/subscript/
+  // https://arduinojson.org/v7/api/jsonobject/subscript/
   template <typename TString>
   FORCE_INLINE
       typename detail::enable_if<detail::IsString<TString>::value,
@@ -116,7 +111,7 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   }
 
   // Gets or sets the member with specified key.
-  // https://arduinojson.org/v6/api/jsonobject/subscript/
+  // https://arduinojson.org/v7/api/jsonobject/subscript/
   template <typename TChar>
   FORCE_INLINE
       typename detail::enable_if<detail::IsString<TChar*>::value,
@@ -126,75 +121,84 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
   }
 
   // Removes the member at the specified iterator.
-  // ⚠️ Doesn't release the memory associated with the removed member.
-  // https://arduinojson.org/v6/api/jsonobject/remove/
+  // https://arduinojson.org/v7/api/jsonobject/remove/
   FORCE_INLINE void remove(iterator it) const {
-    if (!data_)
-      return;
-    data_->removeSlot(it.slot_);
+    detail::ObjectData::remove(data_, it.iterator_, resources_);
   }
 
   // Removes the member with the specified key.
-  // ⚠️ Doesn't release the memory associated with the removed member.
-  // https://arduinojson.org/v6/api/jsonobject/remove/
+  // https://arduinojson.org/v7/api/jsonobject/remove/
   template <typename TString>
   FORCE_INLINE void remove(const TString& key) const {
-    removeMember(detail::adaptString(key));
+    detail::ObjectData::removeMember(data_, detail::adaptString(key),
+                                     resources_);
   }
 
   // Removes the member with the specified key.
-  // ⚠️ Doesn't release the memory associated with the removed member.
-  // https://arduinojson.org/v6/api/jsonobject/remove/
+  // https://arduinojson.org/v7/api/jsonobject/remove/
   template <typename TChar>
   FORCE_INLINE void remove(TChar* key) const {
-    removeMember(detail::adaptString(key));
+    detail::ObjectData::removeMember(data_, detail::adaptString(key),
+                                     resources_);
   }
 
   // Returns true if the object contains the specified key.
-  // https://arduinojson.org/v6/api/jsonobject/containskey/
+  // https://arduinojson.org/v7/api/jsonobject/containskey/
   template <typename TString>
   FORCE_INLINE
       typename detail::enable_if<detail::IsString<TString>::value, bool>::type
       containsKey(const TString& key) const {
-    return getMember(detail::adaptString(key)) != 0;
+    return detail::ObjectData::getMember(data_, detail::adaptString(key),
+                                         resources_) != 0;
   }
 
   // Returns true if the object contains the specified key.
-  // https://arduinojson.org/v6/api/jsonobject/containskey/
+  // https://arduinojson.org/v7/api/jsonobject/containskey/
   template <typename TChar>
   FORCE_INLINE
       typename detail::enable_if<detail::IsString<TChar*>::value, bool>::type
       containsKey(TChar* key) const {
-    return getMember(detail::adaptString(key)) != 0;
+    return detail::ObjectData::getMember(data_, detail::adaptString(key),
+                                         resources_) != 0;
   }
 
-  // Creates an array and adds it to the object.
-  // https://arduinojson.org/v6/api/jsonobject/createnestedarray/
-  template <typename TString>
-  FORCE_INLINE JsonArray createNestedArray(const TString& key) const;
-
-  // Creates an array and adds it to the object.
-  // https://arduinojson.org/v6/api/jsonobject/createnestedarray/
+  // DEPRECATED: use obj[key].to<JsonArray>() instead
   template <typename TChar>
-  FORCE_INLINE JsonArray createNestedArray(TChar* key) const;
+  ARDUINOJSON_DEPRECATED("use obj[key].to<JsonArray>() instead")
+  JsonArray createNestedArray(TChar* key) const {
+    return operator[](key).template to<JsonArray>();
+  }
 
-  // Creates an object and adds it to the object.
-  // https://arduinojson.org/v6/api/jsonobject/createnestedobject/
+  // DEPRECATED: use obj[key].to<JsonArray>() instead
   template <typename TString>
-  JsonObject createNestedObject(const TString& key) const {
+  ARDUINOJSON_DEPRECATED("use obj[key].to<JsonArray>() instead")
+  JsonArray createNestedArray(const TString& key) const {
+    return operator[](key).template to<JsonArray>();
+  }
+
+  // DEPRECATED: use obj[key].to<JsonObject>() instead
+  template <typename TChar>
+  ARDUINOJSON_DEPRECATED("use obj[key].to<JsonObject>() instead")
+  JsonObject createNestedObject(TChar* key) {
     return operator[](key).template to<JsonObject>();
   }
 
-  // Creates an object and adds it to the object.
-  // https://arduinojson.org/v6/api/jsonobject/createnestedobject/
-  template <typename TChar>
-  JsonObject createNestedObject(TChar* key) const {
+  // DEPRECATED: use obj[key].to<JsonObject>() instead
+  template <typename TString>
+  ARDUINOJSON_DEPRECATED("use obj[key].to<JsonObject>() instead")
+  JsonObject createNestedObject(const TString& key) {
     return operator[](key).template to<JsonObject>();
   }
 
+  // DEPRECATED: always returns zero
+  ARDUINOJSON_DEPRECATED("always returns zero")
+  size_t memoryUsage() const {
+    return 0;
+  }
+
  private:
-  detail::MemoryPool* getPool() const {
-    return pool_;
+  detail::ResourceManager* getResourceManager() const {
+    return resources_;
   }
 
   detail::VariantData* getData() const {
@@ -205,47 +209,8 @@ class JsonObject : public detail::VariantOperators<JsonObject> {
     return detail::collectionToVariant(data_);
   }
 
-  template <typename TAdaptedString>
-  inline detail::VariantData* getMember(TAdaptedString key) const {
-    if (!data_)
-      return 0;
-    return data_->getMember(key);
-  }
-
-  template <typename TAdaptedString>
-  void removeMember(TAdaptedString key) const {
-    if (!data_)
-      return;
-    data_->removeMember(key);
-  }
-
-  detail::CollectionData* data_;
-  detail::MemoryPool* pool_;
-};
-
-template <>
-struct Converter<JsonObject> : private detail::VariantAttorney {
-  static void toJson(JsonVariantConst src, JsonVariant dst) {
-    variantCopyFrom(getData(dst), getData(src), getPool(dst));
-  }
-
-  static JsonObject fromJson(JsonVariant src) {
-    auto data = getData(src);
-    auto pool = getPool(src);
-    return JsonObject(pool, data != 0 ? data->asObject() : 0);
-  }
-
-  static detail::InvalidConversion<JsonVariantConst, JsonObject> fromJson(
-      JsonVariantConst);
-
-  static bool checkJson(JsonVariantConst) {
-    return false;
-  }
-
-  static bool checkJson(JsonVariant src) {
-    auto data = getData(src);
-    return data && data->isObject();
-  }
+  detail::ObjectData* data_;
+  detail::ResourceManager* resources_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectConst.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectConst.hpp
index e9b5e4835..8f2c8bb10 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectConst.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectConst.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -10,7 +10,7 @@
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // A read-only reference to an object in a JsonDocument.
-// https://arduinojson.org/v6/api/jsonobjectconst/
+// https://arduinojson.org/v7/api/jsonobjectconst/
 class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
   friend class JsonObject;
   friend class detail::VariantAttorney;
@@ -22,103 +22,94 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
   JsonObjectConst() : data_(0) {}
 
   // INTERNAL USE ONLY
-  JsonObjectConst(const detail::CollectionData* data) : data_(data) {}
+  JsonObjectConst(const detail::ObjectData* data,
+                  const detail::ResourceManager* resources)
+      : data_(data), resources_(resources) {}
 
   operator JsonVariantConst() const {
-    return JsonVariantConst(collectionToVariant(data_));
+    return JsonVariantConst(getData(), resources_);
   }
 
   // Returns true if the reference is unbound.
-  // https://arduinojson.org/v6/api/jsonobjectconst/isnull/
+  // https://arduinojson.org/v7/api/jsonobjectconst/isnull/
   FORCE_INLINE bool isNull() const {
     return data_ == 0;
   }
 
   // Returns true if the reference is bound.
-  // https://arduinojson.org/v6/api/jsonobjectconst/isnull/
+  // https://arduinojson.org/v7/api/jsonobjectconst/isnull/
   FORCE_INLINE operator bool() const {
     return data_ != 0;
   }
 
-  // Returns the number of bytes occupied by the object.
-  // https://arduinojson.org/v6/api/jsonobjectconst/memoryusage/
-  FORCE_INLINE size_t memoryUsage() const {
-    return data_ ? data_->memoryUsage() : 0;
-  }
-
   // Returns the depth (nesting level) of the object.
-  // https://arduinojson.org/v6/api/jsonobjectconst/nesting/
+  // https://arduinojson.org/v7/api/jsonobjectconst/nesting/
   FORCE_INLINE size_t nesting() const {
-    return variantNesting(collectionToVariant(data_));
+    return detail::VariantData::nesting(getData(), resources_);
   }
 
   // Returns the number of members in the object.
-  // https://arduinojson.org/v6/api/jsonobjectconst/size/
+  // https://arduinojson.org/v7/api/jsonobjectconst/size/
   FORCE_INLINE size_t size() const {
-    return data_ ? data_->size() : 0;
+    return data_ ? data_->size(resources_) : 0;
   }
 
   // Returns an iterator to the first key-value pair of the object.
-  // https://arduinojson.org/v6/api/jsonobjectconst/begin/
+  // https://arduinojson.org/v7/api/jsonobjectconst/begin/
   FORCE_INLINE iterator begin() const {
     if (!data_)
       return iterator();
-    return iterator(data_->head());
+    return iterator(data_->createIterator(resources_), resources_);
   }
 
   // Returns an iterator following the last key-value pair of the object.
-  // https://arduinojson.org/v6/api/jsonobjectconst/end/
+  // https://arduinojson.org/v7/api/jsonobjectconst/end/
   FORCE_INLINE iterator end() const {
     return iterator();
   }
 
   // Returns true if the object contains the specified key.
-  // https://arduinojson.org/v6/api/jsonobjectconst/containskey/
+  // https://arduinojson.org/v7/api/jsonobjectconst/containskey/
   template <typename TString>
   FORCE_INLINE bool containsKey(const TString& key) const {
-    return getMember(detail::adaptString(key)) != 0;
+    return detail::ObjectData::getMember(data_, detail::adaptString(key),
+                                         resources_) != 0;
   }
 
   // Returns true if the object contains the specified key.
-  // https://arduinojson.org/v6/api/jsonobjectconst/containskey/
+  // https://arduinojson.org/v7/api/jsonobjectconst/containskey/
   template <typename TChar>
   FORCE_INLINE bool containsKey(TChar* key) const {
-    return getMember(detail::adaptString(key)) != 0;
+    return detail::ObjectData::getMember(data_, detail::adaptString(key),
+                                         resources_) != 0;
   }
 
   // Gets the member with specified key.
-  // https://arduinojson.org/v6/api/jsonobjectconst/subscript/
+  // https://arduinojson.org/v7/api/jsonobjectconst/subscript/
   template <typename TString>
   FORCE_INLINE typename detail::enable_if<detail::IsString<TString>::value,
                                           JsonVariantConst>::type
   operator[](const TString& key) const {
-    return JsonVariantConst(getMember(detail::adaptString(key)));
+    return JsonVariantConst(detail::ObjectData::getMember(
+                                data_, detail::adaptString(key), resources_),
+                            resources_);
   }
 
   // Gets the member with specified key.
-  // https://arduinojson.org/v6/api/jsonobjectconst/subscript/
+  // https://arduinojson.org/v7/api/jsonobjectconst/subscript/
   template <typename TChar>
   FORCE_INLINE typename detail::enable_if<detail::IsString<TChar*>::value,
                                           JsonVariantConst>::type
   operator[](TChar* key) const {
-    return JsonVariantConst(getMember(detail::adaptString(key)));
+    return JsonVariantConst(detail::ObjectData::getMember(
+                                data_, detail::adaptString(key), resources_),
+                            resources_);
   }
 
-  // Compares objects.
-  FORCE_INLINE bool operator==(JsonObjectConst rhs) const {
-    if (data_ == rhs.data_)
-      return true;
-
-    if (!data_ || !rhs.data_)
-      return false;
-
-    size_t count = 0;
-    for (iterator it = begin(); it != end(); ++it) {
-      if (it->value() != rhs[it->key()])
-        return false;
-      count++;
-    }
-    return count == rhs.size();
+  // DEPRECATED: always returns zero
+  ARDUINOJSON_DEPRECATED("always returns zero")
+  size_t memoryUsage() const {
+    return 0;
   }
 
  private:
@@ -126,31 +117,27 @@ class JsonObjectConst : public detail::VariantOperators<JsonObjectConst> {
     return collectionToVariant(data_);
   }
 
-  template <typename TAdaptedString>
-  const detail::VariantData* getMember(TAdaptedString key) const {
-    if (!data_)
-      return 0;
-    return data_->getMember(key);
-  }
-
-  const detail::CollectionData* data_;
+  const detail::ObjectData* data_;
+  const detail::ResourceManager* resources_;
 };
 
-template <>
-struct Converter<JsonObjectConst> : private detail::VariantAttorney {
-  static void toJson(JsonVariantConst src, JsonVariant dst) {
-    variantCopyFrom(getData(dst), getData(src), getPool(dst));
-  }
+inline bool operator==(JsonObjectConst lhs, JsonObjectConst rhs) {
+  if (!lhs && !rhs)  // both are null
+    return true;
 
-  static JsonObjectConst fromJson(JsonVariantConst src) {
-    auto data = getData(src);
-    return data != 0 ? data->asObject() : 0;
-  }
+  if (!lhs || !rhs)  // only one is null
+    return false;
 
-  static bool checkJson(JsonVariantConst src) {
-    auto data = getData(src);
-    return data && data->isObject();
+  size_t count = 0;
+  for (auto kvp : lhs) {
+    auto rhsValue = rhs[kvp.key()];
+    if (rhsValue.isUnbound())
+      return false;
+    if (kvp.value() != rhsValue)
+      return false;
+    count++;
   }
-};
+  return count == rhs.size();
+}
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectImpl.hpp
deleted file mode 100644
index 3b24081a2..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectImpl.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Array/JsonArray.hpp>
-#include <ArduinoJson/Object/JsonObject.hpp>
-
-ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
-
-template <typename TString>
-inline JsonArray JsonObject::createNestedArray(const TString& key) const {
-  return operator[](key).template to<JsonArray>();
-}
-
-template <typename TChar>
-inline JsonArray JsonObject::createNestedArray(TChar* key) const {
-  return operator[](key).template to<JsonArray>();
-}
-
-ARDUINOJSON_END_PUBLIC_NAMESPACE
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-template <typename TDerived>
-template <typename TString>
-inline JsonArray VariantRefBase<TDerived>::createNestedArray(
-    const TString& key) const {
-  return operator[](key).template to<JsonArray>();
-}
-
-template <typename TDerived>
-template <typename TChar>
-inline JsonArray VariantRefBase<TDerived>::createNestedArray(TChar* key) const {
-  return operator[](key).template to<JsonArray>();
-}
-
-template <typename TDerived>
-template <typename TString>
-inline JsonObject VariantRefBase<TDerived>::createNestedObject(
-    const TString& key) const {
-  return operator[](key).template to<JsonObject>();
-}
-
-template <typename TDerived>
-template <typename TChar>
-inline JsonObject VariantRefBase<TDerived>::createNestedObject(
-    TChar* key) const {
-  return operator[](key).template to<JsonObject>();
-}
-
-template <typename TDerived>
-template <typename TString>
-inline typename enable_if<IsString<TString>::value, bool>::type
-VariantRefBase<TDerived>::containsKey(const TString& key) const {
-  return variantGetMember(VariantAttorney::getData(derived()),
-                          adaptString(key)) != 0;
-}
-
-template <typename TDerived>
-template <typename TChar>
-inline typename enable_if<IsString<TChar*>::value, bool>::type
-VariantRefBase<TDerived>::containsKey(TChar* key) const {
-  return variantGetMember(VariantAttorney::getData(derived()),
-                          adaptString(key)) != 0;
-}
-
-template <typename TDerived>
-template <typename TString>
-inline typename enable_if<IsString<TString*>::value,
-                          MemberProxy<TDerived, TString*>>::type
-VariantRefBase<TDerived>::operator[](TString* key) const {
-  return MemberProxy<TDerived, TString*>(derived(), key);
-}
-
-template <typename TDerived>
-template <typename TString>
-inline typename enable_if<IsString<TString>::value,
-                          MemberProxy<TDerived, TString>>::type
-VariantRefBase<TDerived>::operator[](const TString& key) const {
-  return MemberProxy<TDerived, TString>(derived(), key);
-}
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectIterator.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectIterator.hpp
index 55c09ed78..b849e62af 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectIterator.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Object/JsonObjectIterator.hpp
@@ -1,123 +1,81 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Object/JsonPair.hpp>
-#include <ArduinoJson/Variant/SlotFunctions.hpp>
 
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
-class JsonPairPtr {
- public:
-  JsonPairPtr(detail::MemoryPool* pool, detail::VariantSlot* slot)
-      : pair_(pool, slot) {}
-
-  const JsonPair* operator->() const {
-    return &pair_;
-  }
-
-  const JsonPair& operator*() const {
-    return pair_;
-  }
-
- private:
-  JsonPair pair_;
-};
-
 class JsonObjectIterator {
   friend class JsonObject;
 
  public:
-  JsonObjectIterator() : slot_(0) {}
+  JsonObjectIterator() {}
 
-  explicit JsonObjectIterator(detail::MemoryPool* pool,
-                              detail::VariantSlot* slot)
-      : pool_(pool), slot_(slot) {}
+  explicit JsonObjectIterator(detail::ObjectData::iterator iterator,
+                              detail::ResourceManager* resources)
+      : iterator_(iterator), resources_(resources) {}
 
   JsonPair operator*() const {
-    return JsonPair(pool_, slot_);
+    return JsonPair(iterator_, resources_);
   }
-  JsonPairPtr operator->() {
-    return JsonPairPtr(pool_, slot_);
+  Ptr<JsonPair> operator->() {
+    return operator*();
   }
 
   bool operator==(const JsonObjectIterator& other) const {
-    return slot_ == other.slot_;
+    return iterator_ == other.iterator_;
   }
 
   bool operator!=(const JsonObjectIterator& other) const {
-    return slot_ != other.slot_;
+    return iterator_ != other.iterator_;
   }
 
   JsonObjectIterator& operator++() {
-    slot_ = slot_->next();
-    return *this;
-  }
-
-  JsonObjectIterator& operator+=(size_t distance) {
-    slot_ = slot_->next(distance);
+    iterator_.next(resources_);
     return *this;
   }
 
  private:
-  detail::MemoryPool* pool_;
-  detail::VariantSlot* slot_;
-};
-
-class JsonPairConstPtr {
- public:
-  JsonPairConstPtr(const detail::VariantSlot* slot) : pair_(slot) {}
-
-  const JsonPairConst* operator->() const {
-    return &pair_;
-  }
-
-  const JsonPairConst& operator*() const {
-    return pair_;
-  }
-
- private:
-  JsonPairConst pair_;
+  detail::ObjectData::iterator iterator_;
+  detail::ResourceManager* resources_;
 };
 
 class JsonObjectConstIterator {
   friend class JsonObject;
 
  public:
-  JsonObjectConstIterator() : slot_(0) {}
+  JsonObjectConstIterator() {}
 
-  explicit JsonObjectConstIterator(const detail::VariantSlot* slot)
-      : slot_(slot) {}
+  explicit JsonObjectConstIterator(detail::ObjectData::iterator iterator,
+                                   const detail::ResourceManager* resources)
+      : iterator_(iterator), resources_(resources) {}
 
   JsonPairConst operator*() const {
-    return JsonPairConst(slot_);
+    return JsonPairConst(iterator_, resources_);
   }
-  JsonPairConstPtr operator->() {
-    return JsonPairConstPtr(slot_);
+  Ptr<JsonPairConst> operator->() {
+    return operator*();
   }
 
   bool operator==(const JsonObjectConstIterator& other) const {
-    return slot_ == other.slot_;
+    return iterator_ == other.iterator_;
   }
 
   bool operator!=(const JsonObjectConstIterator& other) const {
-    return slot_ != other.slot_;
+    return iterator_ != other.iterator_;
   }
 
   JsonObjectConstIterator& operator++() {
-    slot_ = slot_->next();
-    return *this;
-  }
-
-  JsonObjectConstIterator& operator+=(size_t distance) {
-    slot_ = slot_->next(distance);
+    iterator_.next(resources_);
     return *this;
   }
 
  private:
-  const detail::VariantSlot* slot_;
+  detail::ObjectData::iterator iterator_;
+  const detail::ResourceManager* resources_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Object/JsonPair.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/JsonPair.hpp
index 862a65793..4d621a16f 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Object/JsonPair.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Object/JsonPair.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -11,58 +11,60 @@
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // A key-value pair.
-// https://arduinojson.org/v6/api/jsonobject/begin_end/
+// https://arduinojson.org/v7/api/jsonobject/begin_end/
 class JsonPair {
  public:
   // INTERNAL USE ONLY
-  JsonPair(detail::MemoryPool* pool, detail::VariantSlot* slot) {
-    if (slot) {
-      key_ = JsonString(slot->key(), slot->ownsKey() ? JsonString::Copied
-                                                     : JsonString::Linked);
-      value_ = JsonVariant(pool, slot->data());
-    }
-  }
+  JsonPair(detail::ObjectData::iterator iterator,
+           detail::ResourceManager* resources)
+      : iterator_(iterator), resources_(resources) {}
 
   // Returns the key.
   JsonString key() const {
-    return key_;
+    if (!iterator_.done())
+      return JsonString(iterator_.key(), iterator_.ownsKey()
+                                             ? JsonString::Copied
+                                             : JsonString::Linked);
+    else
+      return JsonString();
   }
 
   // Returns the value.
-  JsonVariant value() const {
-    return value_;
+  JsonVariant value() {
+    return JsonVariant(iterator_.data(), resources_);
   }
 
  private:
-  JsonString key_;
-  JsonVariant value_;
+  detail::ObjectData::iterator iterator_;
+  detail::ResourceManager* resources_;
 };
 
 // A read-only key-value pair.
-// https://arduinojson.org/v6/api/jsonobjectconst/begin_end/
+// https://arduinojson.org/v7/api/jsonobjectconst/begin_end/
 class JsonPairConst {
  public:
-  JsonPairConst(const detail::VariantSlot* slot) {
-    if (slot) {
-      key_ = JsonString(slot->key(), slot->ownsKey() ? JsonString::Copied
-                                                     : JsonString::Linked);
-      value_ = JsonVariantConst(slot->data());
-    }
-  }
+  JsonPairConst(detail::ObjectData::iterator iterator,
+                const detail::ResourceManager* resources)
+      : iterator_(iterator), resources_(resources) {}
 
   // Returns the key.
   JsonString key() const {
-    return key_;
+    if (!iterator_.done())
+      return JsonString(iterator_.key(), iterator_.ownsKey()
+                                             ? JsonString::Copied
+                                             : JsonString::Linked);
+    else
+      return JsonString();
   }
 
   // Returns the value.
   JsonVariantConst value() const {
-    return value_;
+    return JsonVariantConst(iterator_.data(), resources_);
   }
 
  private:
-  JsonString key_;
-  JsonVariantConst value_;
+  detail::ObjectData::iterator iterator_;
+  const detail::ResourceManager* resources_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp
index 78e5a5211..2a56f6dae 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Object/MemberProxy.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -9,7 +9,7 @@
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 // A proxy class to get or set a member of an object.
-// https://arduinojson.org/v6/api/jsonobject/subscript/
+// https://arduinojson.org/v7/api/jsonobject/subscript/
 template <typename TUpstream, typename TStringRef>
 class MemberProxy
     : public VariantRefBase<MemberProxy<TUpstream, TStringRef>>,
@@ -41,19 +41,22 @@ class MemberProxy
   }
 
  private:
-  FORCE_INLINE MemoryPool* getPool() const {
-    return VariantAttorney::getPool(upstream_);
+  FORCE_INLINE ResourceManager* getResourceManager() const {
+    return VariantAttorney::getResourceManager(upstream_);
   }
 
   FORCE_INLINE VariantData* getData() const {
-    return variantGetMember(VariantAttorney::getData(upstream_),
-                            adaptString(key_));
+    return VariantData::getMember(
+        VariantAttorney::getData(upstream_), adaptString(key_),
+        VariantAttorney::getResourceManager(upstream_));
   }
 
   FORCE_INLINE VariantData* getOrCreateData() const {
-    return variantGetOrAddMember(VariantAttorney::getOrCreateData(upstream_),
-                                 adaptString(key_),
-                                 VariantAttorney::getPool(upstream_));
+    auto data = VariantAttorney::getOrCreateData(upstream_);
+    if (!data)
+      return nullptr;
+    return data->getOrAddMember(adaptString(key_),
+                                VariantAttorney::getResourceManager(upstream_));
   }
 
  private:
diff --git a/lib/ArduinoJson/src/ArduinoJson/Object/ObjectData.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectData.hpp
new file mode 100644
index 000000000..40e743eed
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectData.hpp
@@ -0,0 +1,73 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Collection/CollectionData.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+class ObjectData : public CollectionData {
+ public:
+  VariantData* addMember(StringNode* key, ResourceManager* resources) {
+    ARDUINOJSON_ASSERT(key != nullptr);
+    auto it = addSlot(resources);
+    if (it.done())
+      return nullptr;
+
+    it.setKey(key);
+    return it.data();
+  }
+
+  template <typename TAdaptedString>
+  VariantData* addMember(TAdaptedString key, ResourceManager* resources) {
+    ARDUINOJSON_ASSERT(!key.isNull());
+    if (key.isLinked()) {
+      auto it = addSlot(resources);
+      if (!it.done())
+        it.setKey(key.data());
+      return it.data();
+    } else {
+      auto storedKey = resources->saveString(key);
+      if (!storedKey)
+        return nullptr;
+      auto it = addSlot(resources);
+      if (!it.done())
+        it.setKey(storedKey);
+      return it.data();
+    }
+  }
+
+  template <typename TAdaptedString>
+  VariantData* getOrAddMember(TAdaptedString key, ResourceManager* resources);
+
+  template <typename TAdaptedString>
+  VariantData* getMember(TAdaptedString key,
+                         const ResourceManager* resources) const;
+
+  template <typename TAdaptedString>
+  static VariantData* getMember(const ObjectData* object, TAdaptedString key,
+                                const ResourceManager* resources) {
+    if (!object)
+      return nullptr;
+    return object->getMember(key, resources);
+  }
+
+  template <typename TAdaptedString>
+  void removeMember(TAdaptedString key, ResourceManager* resources);
+
+  template <typename TAdaptedString>
+  static void removeMember(ObjectData* obj, TAdaptedString key,
+                           ResourceManager* resources) {
+    if (!obj)
+      return;
+    obj->removeMember(key, resources);
+  }
+
+ private:
+  template <typename TAdaptedString>
+  iterator findKey(TAdaptedString key, const ResourceManager* resources) const;
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp
new file mode 100644
index 000000000..eed39cadf
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Object/ObjectImpl.hpp
@@ -0,0 +1,45 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Object/ObjectData.hpp>
+#include <ArduinoJson/Variant/VariantCompare.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+template <typename TAdaptedString>
+inline VariantData* ObjectData::getMember(
+    TAdaptedString key, const ResourceManager* resources) const {
+  return findKey(key, resources).data();
+}
+
+template <typename TAdaptedString>
+VariantData* ObjectData::getOrAddMember(TAdaptedString key,
+                                        ResourceManager* resources) {
+  auto it = findKey(key, resources);
+  if (!it.done())
+    return it.data();
+  return addMember(key, resources);
+}
+
+template <typename TAdaptedString>
+inline ObjectData::iterator ObjectData::findKey(
+    TAdaptedString key, const ResourceManager* resources) const {
+  if (key.isNull())
+    return iterator();
+  for (auto it = createIterator(resources); !it.done(); it.next(resources)) {
+    if (stringEquals(key, adaptString(it.key())))
+      return it;
+  }
+  return iterator();
+}
+
+template <typename TAdaptedString>
+inline void ObjectData::removeMember(TAdaptedString key,
+                                     ResourceManager* resources) {
+  remove(findKey(key, resources), resources);
+}
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp
index 4dac6c467..1dec0a093 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/alias_cast.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp
index 819bcf505..a83155970 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/assert.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp
index c4196fbb0..2eaaa57cf 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/attributes.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -9,16 +9,32 @@
 #  define FORCE_INLINE  // __forceinline causes C4714 when returning std::string
 #  define NO_INLINE __declspec(noinline)
 
+#  ifndef ARDUINOJSON_DEPRECATED
+#    define ARDUINOJSON_DEPRECATED(msg) __declspec(deprecated(msg))
+#  endif
+
 #elif defined(__GNUC__)  // GCC or Clang
 
 #  define FORCE_INLINE __attribute__((always_inline))
 #  define NO_INLINE __attribute__((noinline))
 
+#  ifndef ARDUINOJSON_DEPRECATED
+#    if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
+#      define ARDUINOJSON_DEPRECATED(msg) __attribute__((deprecated(msg)))
+#    else
+#      define ARDUINOJSON_DEPRECATED(msg) __attribute__((deprecated))
+#    endif
+#  endif
+
 #else  // Other compilers
 
 #  define FORCE_INLINE
 #  define NO_INLINE
 
+#  ifndef ARDUINOJSON_DEPRECATED
+#    define ARDUINOJSON_DEPRECATED(msg)
+#  endif
+
 #endif
 
 #if defined(__has_attribute)
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp
index b3a6231cc..294e32479 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/ctype.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/integer.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/integer.hpp
index 2bfce365d..689116fb6 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/integer.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/integer.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -11,21 +11,21 @@
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 template <int Bits>
-struct int_t;
+struct uint_t;
 
 template <>
-struct int_t<8> {
-  typedef int8_t type;
+struct uint_t<8> {
+  typedef uint8_t type;
 };
 
 template <>
-struct int_t<16> {
-  typedef int16_t type;
+struct uint_t<16> {
+  typedef uint16_t type;
 };
 
 template <>
-struct int_t<32> {
-  typedef int32_t type;
+struct uint_t<32> {
+  typedef uint32_t type;
 };
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp
index cf799da6d..c836f27b3 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/limits.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -19,10 +19,10 @@ struct numeric_limits;
 
 template <typename T>
 struct numeric_limits<T, typename enable_if<is_unsigned<T>::value>::type> {
-  static T lowest() {
+  static constexpr T lowest() {
     return 0;
   }
-  static T highest() {
+  static constexpr T highest() {
     return T(-1);
   }
 };
@@ -30,10 +30,10 @@ struct numeric_limits<T, typename enable_if<is_unsigned<T>::value>::type> {
 template <typename T>
 struct numeric_limits<
     T, typename enable_if<is_integral<T>::value && is_signed<T>::value>::type> {
-  static T lowest() {
+  static constexpr T lowest() {
     return T(T(1) << (sizeof(T) * 8 - 1));
   }
-  static T highest() {
+  static constexpr T highest() {
     return T(~lowest());
   }
 };
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp
index 45fc8d2f0..95a74f6b9 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/math.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp
index 3970b8387..89a31792a 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/mpl/max.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp
index 9e66f96a1..d65de491e 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace_generic.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace_generic.hpp
index dc47581f5..9104ef23f 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace_generic.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/pgmspace_generic.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/preprocessor.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/preprocessor.hpp
index 36e5c44a4..df76497f7 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/preprocessor.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/preprocessor.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp
index 8b61e7c91..4256685bd 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp
index c481bcb83..26f3516ad 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/conditional.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/declval.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/declval.hpp
index 41f63e60b..2fd8e91d8 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/declval.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/declval.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp
index 9d0c530cb..d04e9363e 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/enable_if.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp
index e4e224ef5..e1db890b0 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/integral_constant.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp
index 470031be9..17a4596a6 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_array.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp
index 61820a004..fca3508fb 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_base_of.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_class.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_class.hpp
index f2b3e27a9..2e36b5650 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_class.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_class.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp
index 330134fd8..2adc86a2e 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_const.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
index 7c4810f3f..c6919d48f 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_convertible.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_enum.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_enum.hpp
index a66687961..525ef2477 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_enum.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_enum.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp
index 4a58dfa01..b53ec2f03 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_floating_point.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
index 85d183262..05fca1830 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_integral.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_pointer.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_pointer.hpp
index 2c200da2a..0d3b1d1e9 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_pointer.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_pointer.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp
index 71e668920..5e28fb77d 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_same.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
index eb3cc6249..21328f0b0 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_signed.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
index 803eaea03..cdbc58e08 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/is_unsigned.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
index 847984875..23a6e655a 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_unsigned.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_void.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_void.hpp
index b20d424d5..79879b242 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_void.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/make_void.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp
index 2592566c1..6174db115 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_const.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_cv.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_cv.hpp
index 70ceed346..ecf9fc26d 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_cv.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_cv.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp
index 263c73004..affb21744 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/remove_reference.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp
index 4481bc7e4..0dd1a9f9c 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/type_traits/type_identity.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp b/lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp
index 13fb3e706..0a880318e 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Polyfills/utility.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -8,9 +8,26 @@
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
+using nullptr_t = decltype(nullptr);
+
 template <class T>
 T&& forward(typename remove_reference<T>::type& t) noexcept {
   return static_cast<T&&>(t);
 }
 
+template <class T>
+typename remove_reference<T>::type&& move(T&& t) {
+  return static_cast<typename remove_reference<T>::type&&>(t);
+}
+
+// Polyfull for std::swap
+// Don't use the name "swap" because it makes calls ambiguous for types in the
+// detail namespace
+template <class T>
+void swap_(T& a, T& b) {
+  T tmp = move(a);
+  a = move(b);
+  b = move(tmp);
+}
+
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/CountingDecorator.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/CountingDecorator.hpp
index b38a22dfc..e70ea1b40 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/CountingDecorator.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/CountingDecorator.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp
index f6ba225df..e35d7e91b 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writer.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
index c64324879..d3ebd173f 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/ArduinoStringWriter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -13,8 +13,10 @@ class Writer<::String, void> {
   static const size_t bufferCapacity = ARDUINOJSON_STRING_BUFFER_SIZE;
 
  public:
-  explicit Writer(::String& str) : destination_(&str) {
-    size_ = 0;
+  explicit Writer(::String& str) : destination_(&str), size_(0) {
+    // clear the string but don't use "" to avoid useless allocation
+    // https://cpp4arduino.com/2018/11/21/eight-tips-to-use-the-string-class-efficiently.html
+    str = static_cast<const char*>(0);
   }
 
   ~Writer() {
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp
index ff35def7a..7492e2129 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/DummyWriter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp
index 49f6a6e96..c1d8f73ab 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/PrintWriter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
index 169ebe194..042aac7f8 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StaticStringWriter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp
index fdfead738..5bd95431a 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStreamWriter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp
index 1f8afaa88..46dc8ba55 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/Writers/StdStringWriter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -24,7 +24,9 @@ template <typename TDestination>
 class Writer<TDestination,
              typename enable_if<is_std_string<TDestination>::value>::type> {
  public:
-  Writer(TDestination& str) : str_(&str) {}
+  Writer(TDestination& str) : str_(&str) {
+    str.clear();
+  }
 
   size_t write(uint8_t c) {
     str_->push_back(static_cast<char>(c));
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp
index 5a71e104b..fa2c66456 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/measure.hpp
@@ -1,19 +1,19 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Serialization/Writers/DummyWriter.hpp>
-#include <ArduinoJson/Variant/VariantFunctions.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 template <template <typename> class TSerializer>
 size_t measure(ArduinoJson::JsonVariantConst source) {
   DummyWriter dp;
-  TSerializer<DummyWriter> serializer(dp);
-  return variantAccept(VariantAttorney::getData(source), serializer);
+  TSerializer<DummyWriter> serializer(
+      dp, VariantAttorney::getResourceManager(source));
+  return VariantData::accept(VariantAttorney::getData(source), serializer);
 }
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp b/lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp
index 1014a7d62..06c72c09a 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Serialization/serialize.hpp
@@ -1,18 +1,18 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Serialization/Writer.hpp>
-#include <ArduinoJson/Variant/VariantFunctions.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 template <template <typename> class TSerializer, typename TWriter>
 size_t doSerialize(ArduinoJson::JsonVariantConst source, TWriter writer) {
-  TSerializer<TWriter> serializer(writer);
-  return variantAccept(VariantAttorney::getData(source), serializer);
+  TSerializer<TWriter> serializer(writer,
+                                  VariantAttorney::getResourceManager(source));
+  return VariantData::accept(VariantAttorney::getData(source), serializer);
 }
 
 template <template <typename> class TSerializer, typename TDestination>
diff --git a/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp b/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp
deleted file mode 100644
index bcd34898b..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringCopier.hpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Memory/MemoryPool.hpp>
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-class StringCopier {
- public:
-  StringCopier(MemoryPool* pool) : pool_(pool) {}
-
-  void startString() {
-    pool_->getFreeZone(&ptr_, &capacity_);
-    size_ = 0;
-    if (capacity_ == 0)
-      pool_->markAsOverflowed();
-  }
-
-  JsonString save() {
-    ARDUINOJSON_ASSERT(ptr_);
-    ARDUINOJSON_ASSERT(size_ < capacity_);  // needs room for the terminator
-    return JsonString(pool_->saveStringFromFreeZone(size_), size_,
-                      JsonString::Copied);
-  }
-
-  void append(const char* s) {
-    while (*s)
-      append(*s++);
-  }
-
-  void append(const char* s, size_t n) {
-    while (n-- > 0)
-      append(*s++);
-  }
-
-  void append(char c) {
-    if (size_ + 1 < capacity_)
-      ptr_[size_++] = c;
-    else
-      pool_->markAsOverflowed();
-  }
-
-  bool isValid() const {
-    return !pool_->overflowed();
-  }
-
-  size_t size() const {
-    return size_;
-  }
-
-  JsonString str() const {
-    ARDUINOJSON_ASSERT(ptr_);
-    ARDUINOJSON_ASSERT(size_ < capacity_);
-    ptr_[size_] = 0;
-    return JsonString(ptr_, size_, JsonString::Copied);
-  }
-
- private:
-  MemoryPool* pool_;
-
-  // These fields aren't initialized by the constructor but startString()
-  //
-  // NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.UninitializedObject)
-  char* ptr_;
-  // NOLINTNEXTLINE(clang-analyzer-optin.cplusplus.UninitializedObject)
-  size_t size_, capacity_;
-};
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp b/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp
deleted file mode 100644
index 584b25314..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringMover.hpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Namespace.hpp>
-#include <ArduinoJson/Strings/JsonString.hpp>
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-class StringMover {
- public:
-  StringMover(char* ptr) : writePtr_(ptr) {}
-
-  void startString() {
-    startPtr_ = writePtr_;
-  }
-
-  FORCE_INLINE JsonString save() {
-    JsonString s = str();
-    writePtr_++;
-    return s;
-  }
-
-  void append(char c) {
-    *writePtr_++ = c;
-  }
-
-  bool isValid() const {
-    return true;
-  }
-
-  JsonString str() const {
-    writePtr_[0] = 0;  // terminator
-    return JsonString(startPtr_, size(), JsonString::Linked);
-  }
-
-  size_t size() const {
-    return size_t(writePtr_ - startPtr_);
-  }
-
- private:
-  char* writePtr_;
-  char* startPtr_;
-};
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp b/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp
deleted file mode 100644
index 0b1f77cc8..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/StringStorage/StringStorage.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/StringStorage/StringCopier.hpp>
-#include <ArduinoJson/StringStorage/StringMover.hpp>
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-template <typename TInput>
-StringCopier makeStringStorage(TInput&, MemoryPool* pool) {
-  ARDUINOJSON_ASSERT(pool != 0);
-  return StringCopier(pool);
-}
-
-template <typename TChar>
-StringMover makeStringStorage(
-    TChar* input, MemoryPool*,
-    typename enable_if<!is_const<TChar>::value>::type* = 0) {
-  return StringMover(reinterpret_cast<char*>(input));
-}
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/FlashString.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/FlashString.hpp
index 4989315a2..fafed9633 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/FlashString.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/FlashString.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -26,6 +26,10 @@ class FlashString {
     return static_cast<char>(pgm_read_byte(str_ + i));
   }
 
+  const char* data() const {
+    return nullptr;
+  }
+
   size_t size() const {
     return size_;
   }
@@ -59,8 +63,8 @@ class FlashString {
     ::memcpy_P(p, s.str_, n);
   }
 
-  StringStoragePolicy::Copy storagePolicy() const {
-    return StringStoragePolicy::Copy();
+  bool isLinked() const {
+    return false;
   }
 
  private:
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/JsonString.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/JsonString.hpp
index 5db7c208d..b98c4078e 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/JsonString.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/JsonString.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -15,9 +15,8 @@ class JsonStringAdapter : public SizedRamString {
   JsonStringAdapter(const JsonString& s)
       : SizedRamString(s.c_str(), s.size()), linked_(s.isLinked()) {}
 
-  StringStoragePolicy::LinkOrCopy storagePolicy() const {
-    StringStoragePolicy::LinkOrCopy policy = {linked_};
-    return policy;
+  bool isLinked() const {
+    return linked_;
   }
 
  private:
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/RamString.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/RamString.hpp
index 12c67c94f..8bbba7fe3 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/RamString.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/RamString.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -8,7 +8,7 @@
 #include <string.h>  // strcmp
 
 #include <ArduinoJson/Polyfills/assert.hpp>
-#include <ArduinoJson/Strings/StoragePolicy.hpp>
+#include <ArduinoJson/Polyfills/attributes.hpp>
 #include <ArduinoJson/Strings/StringAdapter.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
@@ -27,7 +27,7 @@ class ZeroTerminatedRamString {
     return !str_;
   }
 
-  size_t size() const {
+  FORCE_INLINE size_t size() const {
     return str_ ? ::strlen(str_) : 0;
   }
 
@@ -53,8 +53,8 @@ class ZeroTerminatedRamString {
     return stringCompare(a, b) == 0;
   }
 
-  StringStoragePolicy::Copy storagePolicy() const {
-    return StringStoragePolicy::Copy();
+  bool isLinked() const {
+    return false;
   }
 
  protected:
@@ -83,8 +83,8 @@ class StaticStringAdapter : public ZeroTerminatedRamString {
  public:
   StaticStringAdapter(const char* str) : ZeroTerminatedRamString(str) {}
 
-  StringStoragePolicy::Link storagePolicy() const {
-    return StringStoragePolicy::Link();
+  bool isLinked() const {
+    return true;
   }
 };
 
@@ -121,8 +121,8 @@ class SizedRamString {
     return str_;
   }
 
-  StringStoragePolicy::Copy storagePolicy() const {
-    return StringStoragePolicy::Copy();
+  bool isLinked() const {
+    return false;
   }
 
  protected:
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/StringObject.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/StringObject.hpp
index d52b0c7fb..68d0eeb8f 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/StringObject.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/Adapters/StringObject.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/IsString.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/IsString.hpp
index 31e4601da..99465de6c 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/IsString.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/IsString.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/JsonString.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/JsonString.hpp
index 538dbc8ad..2ecb697bf 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/JsonString.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/JsonString.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -11,7 +11,7 @@
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // A string.
-// https://arduinojson.org/v6/api/jsonstring/
+// https://arduinojson.org/v7/api/jsonstring/
 class JsonString {
  public:
   enum Ownership { Copied, Linked };
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/StoragePolicy.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/StoragePolicy.hpp
deleted file mode 100644
index b8b3b6a6c..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/StoragePolicy.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-namespace StringStoragePolicy {
-
-struct Link {};
-struct Copy {};
-struct LinkOrCopy {
-  bool link;
-};
-}  // namespace StringStoragePolicy
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapter.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapter.hpp
index 7ebad0b52..9cf2e6fdd 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp
index edf881cef..942700205 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/StringAdapters.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Strings/StringTraits.hpp b/lib/ArduinoJson/src/ArduinoJson/Strings/StringTraits.hpp
index 45804cd15..b66ce6169 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Strings/StringTraits.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Strings/StringTraits.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/Converter.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/Converter.hpp
index 8a63d9969..7f8de24b1 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/Converter.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/Converter.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -17,7 +17,7 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 // clang-format off
 template <typename T1, typename T2>
-class InvalidConversion;  // Error here? See https://arduinojson.org/v6/invalid-conversion/
+class InvalidConversion;  // Error here? See https://arduinojson.org/v7/invalid-conversion/
 // clang-format on
 
 template <typename T>
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/ConverterImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/ConverterImpl.hpp
index e95b33e5d..cc89687ee 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/ConverterImpl.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/ConverterImpl.hpp
@@ -1,12 +1,21 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Json/JsonSerializer.hpp>
+#include <ArduinoJson/Memory/StringBuilder.hpp>
+#include <ArduinoJson/Polyfills/utility.hpp>
 #include <ArduinoJson/Variant/JsonVariantConst.hpp>
-#include <ArduinoJson/Variant/VariantFunctions.hpp>
+
+#if ARDUINOJSON_ENABLE_STD_STRING
+#  include <string>
+#endif
+
+#if ARDUINOJSON_ENABLE_STRING_VIEW
+#  include <string_view>
+#endif
 
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
@@ -14,14 +23,14 @@ template <typename T, typename Enable>
 struct Converter {
   static void toJson(const T& src, JsonVariant dst) {
     // clang-format off
-    convertToJson(src, dst); // Error here? See https://arduinojson.org/v6/unsupported-set/
+    convertToJson(src, dst); // Error here? See https://arduinojson.org/v7/unsupported-set/
     // clang-format on
   }
 
   static T fromJson(JsonVariantConst src) {
     // clang-format off
-    T result; // Error here? See https://arduinojson.org/v6/non-default-constructible/
-    convertFromJson(src, result);  // Error here? See https://arduinojson.org/v6/unsupported-as/
+    T result; // Error here? See https://arduinojson.org/v7/non-default-constructible/
+    convertFromJson(src, result);  // Error here? See https://arduinojson.org/v7/unsupported-as/
     // clang-format on
     return result;
   }
@@ -29,7 +38,7 @@ struct Converter {
   static bool checkJson(JsonVariantConst src) {
     T dummy = T();
     // clang-format off
-    return canConvertFromJson(src, dummy);  // Error here? See https://arduinojson.org/v6/unsupported-is/
+    return canConvertFromJson(src, dummy);  // Error here? See https://arduinojson.org/v7/unsupported-is/
     // clang-format on
   }
 };
@@ -41,10 +50,10 @@ struct Converter<
                                   !detail::is_same<char, T>::value>::type>
     : private detail::VariantAttorney {
   static void toJson(T src, JsonVariant dst) {
-    auto data = getData(dst);
     ARDUINOJSON_ASSERT_INTEGER_TYPE_IS_SUPPORTED(T);
+    auto data = getData(dst);
     if (data)
-      data->setInteger(src);
+      data->setInteger(src, getResourceManager(dst));
   }
 
   static T fromJson(JsonVariantConst src) {
@@ -82,7 +91,7 @@ struct Converter<bool> : private detail::VariantAttorney {
   static void toJson(bool src, JsonVariant dst) {
     auto data = getData(dst);
     if (data)
-      data->setBoolean(src);
+      data->setBoolean(src, getResourceManager(dst));
   }
 
   static bool fromJson(JsonVariantConst src) {
@@ -103,7 +112,7 @@ struct Converter<
   static void toJson(T src, JsonVariant dst) {
     auto data = getData(dst);
     if (data)
-      data->setFloat(static_cast<JsonFloat>(src));
+      data->setFloat(static_cast<JsonFloat>(src), getResourceManager(dst));
   }
 
   static T fromJson(JsonVariantConst src) {
@@ -120,7 +129,8 @@ struct Converter<
 template <>
 struct Converter<const char*> : private detail::VariantAttorney {
   static void toJson(const char* src, JsonVariant dst) {
-    variantSetString(getData(dst), detail::adaptString(src), getPool(dst));
+    detail::VariantData::setString(getData(dst), detail::adaptString(src),
+                                   getResourceManager(dst));
   }
 
   static const char* fromJson(JsonVariantConst src) {
@@ -137,7 +147,8 @@ struct Converter<const char*> : private detail::VariantAttorney {
 template <>
 struct Converter<JsonString> : private detail::VariantAttorney {
   static void toJson(JsonString src, JsonVariant dst) {
-    variantSetString(getData(dst), detail::adaptString(src), getPool(dst));
+    detail::VariantData::setString(getData(dst), detail::adaptString(src),
+                                   getResourceManager(dst));
   }
 
   static JsonString fromJson(JsonVariantConst src) {
@@ -152,46 +163,31 @@ struct Converter<JsonString> : private detail::VariantAttorney {
 };
 
 template <typename T>
-inline typename detail::enable_if<detail::IsString<T>::value, bool>::type
+inline typename detail::enable_if<detail::IsString<T>::value>::type
 convertToJson(const T& src, JsonVariant dst) {
   using namespace detail;
   auto data = VariantAttorney::getData(dst);
-  auto pool = VariantAttorney::getPool(dst);
-  return variantSetString(data, adaptString(src), pool);
+  auto resources = VariantAttorney::getResourceManager(dst);
+  detail::VariantData::setString(data, adaptString(src), resources);
 }
 
-template <>
-struct Converter<SerializedValue<const char*>>
-    : private detail::VariantAttorney {
-  static void toJson(SerializedValue<const char*> src, JsonVariant dst) {
-    auto data = getData(dst);
-    if (data)
-      data->setLinkedRaw(src);
-  }
-};
-
 // SerializedValue<std::string>
 // SerializedValue<String>
 // SerializedValue<const __FlashStringHelper*>
 template <typename T>
-struct Converter<
-    SerializedValue<T>,
-    typename detail::enable_if<!detail::is_same<const char*, T>::value>::type>
-    : private detail::VariantAttorney {
+struct Converter<SerializedValue<T>> : private detail::VariantAttorney {
   static void toJson(SerializedValue<T> src, JsonVariant dst) {
-    auto data = getData(dst);
-    auto pool = getPool(dst);
-    if (data)
-      data->storeOwnedRaw(src, pool);
+    detail::VariantData::setRawString(getData(dst), src,
+                                      getResourceManager(dst));
   }
 };
 
 template <>
-struct Converter<decltype(nullptr)> : private detail::VariantAttorney {
-  static void toJson(decltype(nullptr), JsonVariant dst) {
-    variantSetNull(getData(dst));
+struct Converter<detail::nullptr_t> : private detail::VariantAttorney {
+  static void toJson(detail::nullptr_t, JsonVariant dst) {
+    detail::VariantData::setNull(getData(dst), getResourceManager(dst));
   }
-  static decltype(nullptr) fromJson(JsonVariantConst) {
+  static detail::nullptr_t fromJson(JsonVariantConst) {
     return nullptr;
   }
   static bool checkJson(JsonVariantConst src) {
@@ -203,61 +199,52 @@ struct Converter<decltype(nullptr)> : private detail::VariantAttorney {
 #if ARDUINOJSON_ENABLE_ARDUINO_STREAM
 
 namespace detail {
-class MemoryPoolPrint : public Print {
+class StringBuilderPrint : public Print {
  public:
-  MemoryPoolPrint(MemoryPool* pool) : pool_(pool), size_(0) {
-    pool->getFreeZone(&string_, &capacity_);
+  StringBuilderPrint(ResourceManager* resources) : copier_(resources) {
+    copier_.startString();
   }
 
-  JsonString str() {
-    ARDUINOJSON_ASSERT(size_ < capacity_);
-    return JsonString(pool_->saveStringFromFreeZone(size_), size_,
-                      JsonString::Copied);
+  StringNode* save() {
+    ARDUINOJSON_ASSERT(!overflowed());
+    return copier_.save();
   }
 
   size_t write(uint8_t c) {
-    if (size_ >= capacity_)
-      return 0;
-
-    string_[size_++] = char(c);
-    return 1;
+    copier_.append(char(c));
+    return copier_.isValid() ? 1 : 0;
   }
 
   size_t write(const uint8_t* buffer, size_t size) {
-    if (size_ + size >= capacity_) {
-      size_ = capacity_;  // mark as overflowed
-      return 0;
+    for (size_t i = 0; i < size; i++) {
+      copier_.append(char(buffer[i]));
+      if (!copier_.isValid())
+        return i;
     }
-    memcpy(&string_[size_], buffer, size);
-    size_ += size;
     return size;
   }
 
   bool overflowed() const {
-    return size_ >= capacity_;
+    return !copier_.isValid();
   }
 
  private:
-  MemoryPool* pool_;
-  size_t size_;
-  char* string_;
-  size_t capacity_;
+  StringBuilder copier_;
 };
 }  // namespace detail
 
 inline void convertToJson(const ::Printable& src, JsonVariant dst) {
-  auto pool = detail::VariantAttorney::getPool(dst);
+  auto resources = detail::VariantAttorney::getResourceManager(dst);
   auto data = detail::VariantAttorney::getData(dst);
-  if (!pool || !data)
+  if (!resources || !data)
     return;
-  detail::MemoryPoolPrint print(pool);
+  detail::StringBuilderPrint print(resources);
   src.printTo(print);
   if (print.overflowed()) {
-    pool->markAsOverflowed();
     data->setNull();
     return;
   }
-  data->setString(print.str());
+  data->setOwnedString(print.save());
 }
 
 #endif
@@ -321,4 +308,102 @@ struct ConverterNeedsWriteableRef {
 };
 }  // namespace detail
 
+template <>
+struct Converter<JsonArrayConst> : private detail::VariantAttorney {
+  static void toJson(JsonArrayConst src, JsonVariant dst) {
+    if (src.isNull())
+      dst.set(nullptr);
+    else
+      dst.to<JsonArray>().set(src);
+  }
+
+  static JsonArrayConst fromJson(JsonVariantConst src) {
+    auto data = getData(src);
+    auto array = data ? data->asArray() : nullptr;
+    return JsonArrayConst(array, getResourceManager(src));
+  }
+
+  static bool checkJson(JsonVariantConst src) {
+    auto data = getData(src);
+    return data && data->isArray();
+  }
+};
+
+template <>
+struct Converter<JsonArray> : private detail::VariantAttorney {
+  static void toJson(JsonVariantConst src, JsonVariant dst) {
+    if (src.isNull())
+      dst.set(nullptr);
+    else
+      dst.to<JsonArray>().set(src);
+  }
+
+  static JsonArray fromJson(JsonVariant src) {
+    auto data = getData(src);
+    auto resources = getResourceManager(src);
+    return JsonArray(data != 0 ? data->asArray() : 0, resources);
+  }
+
+  static detail::InvalidConversion<JsonVariantConst, JsonArray> fromJson(
+      JsonVariantConst);
+
+  static bool checkJson(JsonVariantConst) {
+    return false;
+  }
+
+  static bool checkJson(JsonVariant src) {
+    auto data = getData(src);
+    return data && data->isArray();
+  }
+};
+
+template <>
+struct Converter<JsonObjectConst> : private detail::VariantAttorney {
+  static void toJson(JsonVariantConst src, JsonVariant dst) {
+    if (src.isNull())
+      dst.set(nullptr);
+    else
+      dst.to<JsonObject>().set(src);
+  }
+
+  static JsonObjectConst fromJson(JsonVariantConst src) {
+    auto data = getData(src);
+    auto object = data != 0 ? data->asObject() : nullptr;
+    return JsonObjectConst(object, getResourceManager(src));
+  }
+
+  static bool checkJson(JsonVariantConst src) {
+    auto data = getData(src);
+    return data && data->isObject();
+  }
+};
+
+template <>
+struct Converter<JsonObject> : private detail::VariantAttorney {
+  static void toJson(JsonVariantConst src, JsonVariant dst) {
+    if (src.isNull())
+      dst.set(nullptr);
+    else
+      dst.to<JsonObject>().set(src);
+  }
+
+  static JsonObject fromJson(JsonVariant src) {
+    auto data = getData(src);
+    auto resources = getResourceManager(src);
+    return JsonObject(data != 0 ? data->asObject() : 0, resources);
+  }
+
+  static detail::InvalidConversion<JsonVariantConst, JsonObject> fromJson(
+      JsonVariantConst);
+
+  static bool checkJson(JsonVariantConst) {
+    return false;
+  }
+
+  static bool checkJson(JsonVariant src) {
+    auto data = getData(src);
+    return data && data->isObject();
+  }
+};
+
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariant.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariant.hpp
index d1f122e9c..f38963c1b 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariant.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariant.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -9,22 +9,22 @@
 ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
 
 // A reference to a value in a JsonDocument.
-// https://arduinojson.org/v6/api/jsonvariant/
+// https://arduinojson.org/v7/api/jsonvariant/
 class JsonVariant : public detail::VariantRefBase<JsonVariant>,
                     public detail::VariantOperators<JsonVariant> {
   friend class detail::VariantAttorney;
 
  public:
   // Creates an unbound reference.
-  JsonVariant() : data_(0), pool_(0) {}
+  JsonVariant() : data_(0), resources_(0) {}
 
   // INTERNAL USE ONLY
-  JsonVariant(detail::MemoryPool* pool, detail::VariantData* data)
-      : data_(data), pool_(pool) {}
+  JsonVariant(detail::VariantData* data, detail::ResourceManager* resources)
+      : data_(data), resources_(resources) {}
 
  private:
-  FORCE_INLINE detail::MemoryPool* getPool() const {
-    return pool_;
+  FORCE_INLINE detail::ResourceManager* getResourceManager() const {
+    return resources_;
   }
 
   FORCE_INLINE detail::VariantData* getData() const {
@@ -36,13 +36,17 @@ class JsonVariant : public detail::VariantRefBase<JsonVariant>,
   }
 
   detail::VariantData* data_;
-  detail::MemoryPool* pool_;
+  detail::ResourceManager* resources_;
 };
 
+namespace detail {
+bool copyVariant(JsonVariant dst, JsonVariantConst src);
+}
+
 template <>
 struct Converter<JsonVariant> : private detail::VariantAttorney {
-  static void toJson(JsonVariant src, JsonVariant dst) {
-    detail::variantCopyFrom(getData(dst), getData(src), getPool(dst));
+  static void toJson(JsonVariantConst src, JsonVariant dst) {
+    copyVariant(dst, src);
   }
 
   static JsonVariant fromJson(JsonVariant src) {
@@ -65,11 +69,11 @@ struct Converter<JsonVariant> : private detail::VariantAttorney {
 template <>
 struct Converter<JsonVariantConst> : private detail::VariantAttorney {
   static void toJson(JsonVariantConst src, JsonVariant dst) {
-    variantCopyFrom(getData(dst), getData(src), getPool(dst));
+    copyVariant(dst, src);
   }
 
   static JsonVariantConst fromJson(JsonVariantConst src) {
-    return JsonVariantConst(getData(src));
+    return JsonVariantConst(getData(src), getResourceManager(src));
   }
 
   static bool checkJson(JsonVariantConst src) {
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantConst.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantConst.hpp
index 606df0833..8ff741110 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantConst.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantConst.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -7,12 +7,11 @@
 #include <stddef.h>
 #include <stdint.h>  // for uint8_t
 
-#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/Polyfills/type_traits.hpp>
 #include <ArduinoJson/Strings/IsString.hpp>
 #include <ArduinoJson/Strings/StringAdapters.hpp>
 #include <ArduinoJson/Variant/VariantAttorney.hpp>
-#include <ArduinoJson/Variant/VariantFunctions.hpp>
 #include <ArduinoJson/Variant/VariantOperators.hpp>
 #include <ArduinoJson/Variant/VariantTag.hpp>
 
@@ -23,23 +22,24 @@ class JsonArray;
 class JsonObject;
 
 // A read-only reference to a value in a JsonDocument
-// https://arduinojson.org/v6/api/jsonarrayconst/
+// https://arduinojson.org/v7/api/jsonarrayconst/
 class JsonVariantConst : public detail::VariantTag,
                          public detail::VariantOperators<JsonVariantConst> {
   friend class detail::VariantAttorney;
 
  public:
   // Creates an unbound reference.
-  JsonVariantConst() : data_(0) {}
+  JsonVariantConst() : data_(nullptr), resources_(nullptr) {}
 
   // INTERNAL USE ONLY
-  explicit JsonVariantConst(const detail::VariantData* data) : data_(data) {}
+  explicit JsonVariantConst(const detail::VariantData* data,
+                            const detail::ResourceManager* resources)
+      : data_(data), resources_(resources) {}
 
   // Returns true if the value is null or the reference is unbound.
-  // https://arduinojson.org/v6/api/jsonvariantconst/isnull/
+  // https://arduinojson.org/v7/api/jsonvariantconst/isnull/
   FORCE_INLINE bool isNull() const {
-    using namespace detail;
-    return variantIsNull(data_);
+    return detail::VariantData::isNull(data_);
   }
 
   // Returns true if the reference is unbound.
@@ -47,26 +47,20 @@ class JsonVariantConst : public detail::VariantTag,
     return !data_;
   }
 
-  // Returns the number of bytes occupied by the value.
-  // https://arduinojson.org/v6/api/jsonvariantconst/memoryusage/
-  FORCE_INLINE size_t memoryUsage() const {
-    return data_ ? data_->memoryUsage() : 0;
-  }
-
   // Returns the depth (nesting level) of the value.
-  // https://arduinojson.org/v6/api/jsonvariantconst/nesting/
+  // https://arduinojson.org/v7/api/jsonvariantconst/nesting/
   FORCE_INLINE size_t nesting() const {
-    return variantNesting(data_);
+    return detail::VariantData::nesting(data_, resources_);
   }
 
   // Returns the size of the array or object.
-  // https://arduinojson.org/v6/api/jsonvariantconst/size/
+  // https://arduinojson.org/v7/api/jsonvariantconst/size/
   size_t size() const {
-    return variantSize(data_);
+    return detail::VariantData::size(data_, resources_);
   }
 
   // Casts the value to the specified type.
-  // https://arduinojson.org/v6/api/jsonvariantconst/as/
+  // https://arduinojson.org/v7/api/jsonvariantconst/as/
   template <typename T>
   FORCE_INLINE typename detail::enable_if<!detail::is_same<T, char*>::value &&
                                               !detail::is_same<T, char>::value,
@@ -76,7 +70,7 @@ class JsonVariantConst : public detail::VariantTag,
   }
 
   // Returns true if the value is of the specified type.
-  // https://arduinojson.org/v6/api/jsonvariantconst/is/
+  // https://arduinojson.org/v7/api/jsonvariantconst/is/
   template <typename T>
   FORCE_INLINE typename detail::enable_if<!detail::is_same<T, char*>::value &&
                                               !detail::is_same<T, char>::value,
@@ -91,45 +85,58 @@ class JsonVariantConst : public detail::VariantTag,
   }
 
   // Gets array's element at specified index.
-  // https://arduinojson.org/v6/api/jsonvariantconst/subscript/
+  // https://arduinojson.org/v7/api/jsonvariantconst/subscript/
   FORCE_INLINE JsonVariantConst operator[](size_t index) const {
-    return JsonVariantConst(variantGetElement(data_, index));
+    return JsonVariantConst(
+        detail::VariantData::getElement(data_, index, resources_), resources_);
   }
 
   // Gets object's member with specified key.
-  // https://arduinojson.org/v6/api/jsonvariantconst/subscript/
+  // https://arduinojson.org/v7/api/jsonvariantconst/subscript/
   template <typename TString>
   FORCE_INLINE typename detail::enable_if<detail::IsString<TString>::value,
                                           JsonVariantConst>::type
   operator[](const TString& key) const {
-    return JsonVariantConst(variantGetMember(data_, detail::adaptString(key)));
+    return JsonVariantConst(detail::VariantData::getMember(
+                                data_, detail::adaptString(key), resources_),
+                            resources_);
   }
 
   // Gets object's member with specified key.
-  // https://arduinojson.org/v6/api/jsonvariantconst/subscript/
+  // https://arduinojson.org/v7/api/jsonvariantconst/subscript/
   template <typename TChar>
   FORCE_INLINE typename detail::enable_if<detail::IsString<TChar*>::value,
                                           JsonVariantConst>::type
   operator[](TChar* key) const {
-    return JsonVariantConst(variantGetMember(data_, detail::adaptString(key)));
+    return JsonVariantConst(detail::VariantData::getMember(
+                                data_, detail::adaptString(key), resources_),
+                            resources_);
   }
 
   // Returns true if tge object contains the specified key.
-  // https://arduinojson.org/v6/api/jsonvariantconst/containskey/
+  // https://arduinojson.org/v7/api/jsonvariantconst/containskey/
   template <typename TString>
   FORCE_INLINE
       typename detail::enable_if<detail::IsString<TString>::value, bool>::type
       containsKey(const TString& key) const {
-    return variantGetMember(getData(), detail::adaptString(key)) != 0;
+    return detail::VariantData::getMember(getData(), detail::adaptString(key),
+                                          resources_) != 0;
   }
 
   // Returns true if tge object contains the specified key.
-  // https://arduinojson.org/v6/api/jsonvariantconst/containskey/
+  // https://arduinojson.org/v7/api/jsonvariantconst/containskey/
   template <typename TChar>
   FORCE_INLINE
       typename detail::enable_if<detail::IsString<TChar*>::value, bool>::type
       containsKey(TChar* key) const {
-    return variantGetMember(getData(), detail::adaptString(key)) != 0;
+    return detail::VariantData::getMember(getData(), detail::adaptString(key),
+                                          resources_) != 0;
+  }
+
+  // DEPRECATED: always returns zero
+  ARDUINOJSON_DEPRECATED("always returns zero")
+  size_t memoryUsage() const {
+    return 0;
   }
 
  protected:
@@ -137,8 +144,13 @@ class JsonVariantConst : public detail::VariantTag,
     return data_;
   }
 
+  const detail::ResourceManager* getResourceManager() const {
+    return resources_;
+  }
+
  private:
   const detail::VariantData* data_;
+  const detail::ResourceManager* resources_;
 };
 
 ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantCopier.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantCopier.hpp
new file mode 100644
index 000000000..032f1f841
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantCopier.hpp
@@ -0,0 +1,34 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Variant/JsonVariant.hpp>
+#include <ArduinoJson/Variant/JsonVariantVisitor.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+class JsonVariantCopier {
+ public:
+  typedef bool result_type;
+
+  JsonVariantCopier(JsonVariant dst) : dst_(dst) {}
+
+  template <typename T>
+  bool visit(T src) {
+    return dst_.set(src);
+  }
+
+ private:
+  JsonVariant dst_;
+};
+
+inline bool copyVariant(JsonVariant dst, JsonVariantConst src) {
+  if (dst.isUnbound())
+    return false;
+  JsonVariantCopier copier(dst);
+  return accept(src, copier);
+}
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantVisitor.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantVisitor.hpp
new file mode 100644
index 000000000..471962702
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/JsonVariantVisitor.hpp
@@ -0,0 +1,61 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/JsonArray.hpp>
+#include <ArduinoJson/Object/JsonObject.hpp>
+#include <ArduinoJson/Variant/JsonVariant.hpp>
+#include <ArduinoJson/Variant/VariantDataVisitor.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+template <typename TResult>
+struct JsonVariantVisitor {
+  typedef TResult result_type;
+
+  template <typename T>
+  TResult visit(const T&) {
+    return TResult();
+  }
+};
+
+template <typename TVisitor>
+class VisitorAdapter {
+ public:
+  using result_type = typename TVisitor::result_type;
+
+  VisitorAdapter(TVisitor& visitor, const ResourceManager* resources)
+      : visitor_(&visitor), resources_(resources) {}
+
+  result_type visit(const ArrayData& value) {
+    return visitor_->visit(JsonArrayConst(&value, resources_));
+  }
+
+  result_type visit(const ObjectData& value) {
+    return visitor_->visit(JsonObjectConst(&value, resources_));
+  }
+
+  template <typename T>
+  result_type visit(const T& value) {
+    return visitor_->visit(value);
+  }
+
+ private:
+  TVisitor* visitor_;
+  const ResourceManager* resources_;
+};
+
+template <typename TVisitor>
+typename TVisitor::result_type accept(JsonVariantConst variant,
+                                      TVisitor& visit) {
+  auto data = VariantAttorney::getData(variant);
+  if (!data)
+    return visit.visit(nullptr);
+  auto resources = VariantAttorney::getResourceManager(variant);
+  VisitorAdapter<TVisitor> adapter(visit, resources);
+  return data->accept(adapter);
+}
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp
deleted file mode 100644
index 8fee77f2d..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/SlotFunctions.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Polyfills/assert.hpp>
-#include <ArduinoJson/Variant/VariantData.hpp>
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-struct SlotKeySetter {
-  SlotKeySetter(VariantSlot* instance) : instance_(instance) {}
-
-  template <typename TStoredString>
-  void operator()(TStoredString s) {
-    if (!s)
-      return;
-    ARDUINOJSON_ASSERT(instance_ != 0);
-    instance_->setKey(s);
-  }
-
-  VariantSlot* instance_;
-};
-
-template <typename TAdaptedString>
-inline bool slotSetKey(VariantSlot* var, TAdaptedString key, MemoryPool* pool) {
-  if (!var)
-    return false;
-  return storeString(pool, key, SlotKeySetter(var));
-}
-
-inline size_t slotSize(const VariantSlot* var) {
-  size_t n = 0;
-  while (var) {
-    n++;
-    var = var->next();
-  }
-  return n;
-}
-
-inline VariantData* slotData(VariantSlot* slot) {
-  return reinterpret_cast<VariantData*>(slot);
-}
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAttorney.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAttorney.hpp
index a2f6815f6..24f22dda5 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAttorney.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantAttorney.hpp
@@ -1,11 +1,12 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <ArduinoJson/Polyfills/attributes.hpp>
 #include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Variant/VariantData.hpp>
 #include <ArduinoJson/Variant/VariantTo.hpp>
 #include "JsonVariantConst.hpp"
 
@@ -13,29 +14,16 @@ ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
 // Grants access to the internal variant API
 class VariantAttorney {
-  // Tells whether getData() returns a const pointer
-  template <typename TClient>
-  struct ResultOfGetData {
-   protected:  // <- to avoid GCC's "all member functions in class are private"
-    static int probe(const VariantData*);
-    static char probe(VariantData*);
-
-    static TClient& client;
-
-   public:
-    typedef typename conditional<sizeof(probe(client.getData())) == sizeof(int),
-                                 const VariantData*, VariantData*>::type type;
-  };
-
  public:
   template <typename TClient>
-  FORCE_INLINE static MemoryPool* getPool(TClient& client) {
-    return client.getPool();
+  FORCE_INLINE static auto getResourceManager(TClient& client)
+      -> decltype(client.getResourceManager()) {
+    return client.getResourceManager();
   }
 
   template <typename TClient>
-  FORCE_INLINE static typename ResultOfGetData<TClient>::type getData(
-      TClient& client) {
+  FORCE_INLINE static auto getData(TClient& client)
+      -> decltype(client.getData()) {
     return client.getData();
   }
 
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantCompare.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantCompare.hpp
index 42445c6b9..7a9230808 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantCompare.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantCompare.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -7,14 +7,13 @@
 #include <ArduinoJson/Configuration.hpp>
 #include <ArduinoJson/Numbers/arithmeticCompare.hpp>
 #include <ArduinoJson/Polyfills/type_traits.hpp>
+#include <ArduinoJson/Polyfills/utility.hpp>
 #include <ArduinoJson/Strings/StringAdapters.hpp>
-#include <ArduinoJson/Variant/Visitor.hpp>
+#include <ArduinoJson/Variant/JsonVariantVisitor.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
-class CollectionData;
-
-struct ComparerBase : Visitor<CompareResult> {};
+struct ComparerBase : JsonVariantVisitor<CompareResult> {};
 
 template <typename T, typename Enable = void>
 struct Comparer;
@@ -26,8 +25,8 @@ struct Comparer<T, typename enable_if<IsString<T>::value>::type>
 
   explicit Comparer(T value) : rhs(value) {}
 
-  CompareResult visitString(const char* lhs, size_t n) {
-    int i = stringCompare(adaptString(rhs), adaptString(lhs, n));
+  CompareResult visit(JsonString lhs) {
+    int i = stringCompare(adaptString(rhs), adaptString(lhs));
     if (i < 0)
       return COMPARE_RESULT_GREATER;
     else if (i > 0)
@@ -36,12 +35,14 @@ struct Comparer<T, typename enable_if<IsString<T>::value>::type>
       return COMPARE_RESULT_EQUAL;
   }
 
-  CompareResult visitNull() {
+  CompareResult visit(nullptr_t) {
     if (adaptString(rhs).isNull())
       return COMPARE_RESULT_EQUAL;
     else
       return COMPARE_RESULT_DIFFER;
   }
+
+  using ComparerBase::visit;
 };
 
 template <typename T>
@@ -52,70 +53,76 @@ struct Comparer<T, typename enable_if<is_integral<T>::value ||
 
   explicit Comparer(T value) : rhs(value) {}
 
-  CompareResult visitFloat(JsonFloat lhs) {
+  CompareResult visit(JsonFloat lhs) {
     return arithmeticCompare(lhs, rhs);
   }
 
-  CompareResult visitSignedInteger(JsonInteger lhs) {
+  CompareResult visit(JsonInteger lhs) {
     return arithmeticCompare(lhs, rhs);
   }
 
-  CompareResult visitUnsignedInteger(JsonUInt lhs) {
+  CompareResult visit(JsonUInt lhs) {
     return arithmeticCompare(lhs, rhs);
   }
 
-  CompareResult visitBoolean(bool lhs) {
-    return visitUnsignedInteger(static_cast<JsonUInt>(lhs));
+  CompareResult visit(bool lhs) {
+    return visit(static_cast<JsonUInt>(lhs));
   }
+
+  using ComparerBase::visit;
 };
 
 struct NullComparer : ComparerBase {
-  CompareResult visitNull() {
+  CompareResult visit(nullptr_t) {
     return COMPARE_RESULT_EQUAL;
   }
+
+  using ComparerBase::visit;
 };
 
 template <>
-struct Comparer<decltype(nullptr), void> : NullComparer {
-  explicit Comparer(decltype(nullptr)) : NullComparer() {}
+struct Comparer<nullptr_t, void> : NullComparer {
+  explicit Comparer(nullptr_t) : NullComparer() {}
 };
 
 struct ArrayComparer : ComparerBase {
-  const CollectionData* rhs_;
+  JsonArrayConst rhs_;
 
-  explicit ArrayComparer(const CollectionData& rhs) : rhs_(&rhs) {}
+  explicit ArrayComparer(JsonArrayConst rhs) : rhs_(rhs) {}
 
-  CompareResult visitArray(const CollectionData& lhs) {
-    if (JsonArrayConst(&lhs) == JsonArrayConst(rhs_))
+  CompareResult visit(JsonArrayConst lhs) {
+    if (rhs_ == lhs)
       return COMPARE_RESULT_EQUAL;
     else
       return COMPARE_RESULT_DIFFER;
   }
+
+  using ComparerBase::visit;
 };
 
 struct ObjectComparer : ComparerBase {
-  const CollectionData* rhs_;
+  JsonObjectConst rhs_;
 
-  explicit ObjectComparer(const CollectionData& rhs) : rhs_(&rhs) {}
+  explicit ObjectComparer(JsonObjectConst rhs) : rhs_(rhs) {}
 
-  CompareResult visitObject(const CollectionData& lhs) {
-    if (JsonObjectConst(&lhs) == JsonObjectConst(rhs_))
+  CompareResult visit(JsonObjectConst lhs) {
+    if (lhs == rhs_)
       return COMPARE_RESULT_EQUAL;
     else
       return COMPARE_RESULT_DIFFER;
   }
+
+  using ComparerBase::visit;
 };
 
 struct RawComparer : ComparerBase {
-  const char* rhsData_;
-  size_t rhsSize_;
+  RawString rhs_;
 
-  explicit RawComparer(const char* rhsData, size_t rhsSize)
-      : rhsData_(rhsData), rhsSize_(rhsSize) {}
+  explicit RawComparer(RawString rhs) : rhs_(rhs) {}
 
-  CompareResult visitRawJson(const char* lhsData, size_t lhsSize) {
-    size_t size = rhsSize_ < lhsSize ? rhsSize_ : lhsSize;
-    int n = memcmp(lhsData, rhsData_, size);
+  CompareResult visit(RawString lhs) {
+    size_t size = rhs_.size() < lhs.size() ? rhs_.size() : lhs.size();
+    int n = memcmp(lhs.data(), rhs_.data(), size);
     if (n < 0)
       return COMPARE_RESULT_LESS;
     else if (n > 0)
@@ -123,62 +130,64 @@ struct RawComparer : ComparerBase {
     else
       return COMPARE_RESULT_EQUAL;
   }
+
+  using ComparerBase::visit;
 };
 
 struct VariantComparer : ComparerBase {
-  const VariantData* rhs;
+  JsonVariantConst rhs;
 
-  explicit VariantComparer(const VariantData* value) : rhs(value) {}
+  explicit VariantComparer(JsonVariantConst value) : rhs(value) {}
 
-  CompareResult visitArray(const CollectionData& lhs) {
+  CompareResult visit(JsonArrayConst lhs) {
     ArrayComparer comparer(lhs);
-    return accept(comparer);
+    return reverseResult(comparer);
   }
 
-  CompareResult visitObject(const CollectionData& lhs) {
+  CompareResult visit(JsonObjectConst lhs) {
     ObjectComparer comparer(lhs);
-    return accept(comparer);
+    return reverseResult(comparer);
   }
 
-  CompareResult visitFloat(JsonFloat lhs) {
+  CompareResult visit(JsonFloat lhs) {
     Comparer<JsonFloat> comparer(lhs);
-    return accept(comparer);
+    return reverseResult(comparer);
   }
 
-  CompareResult visitString(const char* lhs, size_t) {
-    Comparer<const char*> comparer(lhs);
-    return accept(comparer);
+  CompareResult visit(JsonString lhs) {
+    Comparer<JsonString> comparer(lhs);
+    return reverseResult(comparer);
   }
 
-  CompareResult visitRawJson(const char* lhsData, size_t lhsSize) {
-    RawComparer comparer(lhsData, lhsSize);
-    return accept(comparer);
+  CompareResult visit(RawString value) {
+    RawComparer comparer(value);
+    return reverseResult(comparer);
   }
 
-  CompareResult visitSignedInteger(JsonInteger lhs) {
+  CompareResult visit(JsonInteger lhs) {
     Comparer<JsonInteger> comparer(lhs);
-    return accept(comparer);
+    return reverseResult(comparer);
   }
 
-  CompareResult visitUnsignedInteger(JsonUInt lhs) {
+  CompareResult visit(JsonUInt lhs) {
     Comparer<JsonUInt> comparer(lhs);
-    return accept(comparer);
+    return reverseResult(comparer);
   }
 
-  CompareResult visitBoolean(bool lhs) {
+  CompareResult visit(bool lhs) {
     Comparer<bool> comparer(lhs);
-    return accept(comparer);
+    return reverseResult(comparer);
   }
 
-  CompareResult visitNull() {
+  CompareResult visit(nullptr_t) {
     NullComparer comparer;
-    return accept(comparer);
+    return reverseResult(comparer);
   }
 
  private:
   template <typename TComparer>
-  CompareResult accept(TComparer& comparer) {
-    CompareResult reversedResult = variantAccept(rhs, comparer);
+  CompareResult reverseResult(TComparer& comparer) {
+    CompareResult reversedResult = accept(rhs, comparer);
     switch (reversedResult) {
       case COMPARE_RESULT_GREATER:
         return COMPARE_RESULT_LESS;
@@ -195,13 +204,13 @@ struct Comparer<T, typename enable_if<is_convertible<
                        T, ArduinoJson::JsonVariantConst>::value>::type>
     : VariantComparer {
   explicit Comparer(const T& value)
-      : VariantComparer(VariantAttorney::getData(value)) {}
+      : VariantComparer(static_cast<JsonVariantConst>(value)) {}
 };
 
 template <typename T>
 CompareResult compare(ArduinoJson::JsonVariantConst lhs, const T& rhs) {
   Comparer<T> comparer(rhs);
-  return variantAccept(VariantAttorney::getData(lhs), comparer);
+  return accept(lhs, comparer);
 }
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp
index 22239019b..fa2cb50ef 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantContent.hpp
@@ -1,14 +1,15 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
 #include <stddef.h>  // size_t
 
-#include <ArduinoJson/Collection/CollectionData.hpp>
+#include <ArduinoJson/Array/ArrayData.hpp>
 #include <ArduinoJson/Numbers/JsonFloat.hpp>
 #include <ArduinoJson/Numbers/JsonInteger.hpp>
+#include <ArduinoJson/Object/ObjectData.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
@@ -17,8 +18,7 @@ enum {
 
   OWNED_VALUE_BIT = 0x01,
   VALUE_IS_NULL = 0,
-  VALUE_IS_LINKED_RAW = 0x02,
-  VALUE_IS_OWNED_RAW = 0x03,
+  VALUE_IS_RAW_STRING = 0x03,
   VALUE_IS_LINKED_STRING = 0x04,
   VALUE_IS_OWNED_STRING = 0x05,
 
@@ -38,21 +38,18 @@ enum {
   OWNED_KEY_BIT = 0x80
 };
 
-struct RawData {
-  const char* data;
-  size_t size;
-};
-
 union VariantContent {
+  VariantContent() {}
+
   JsonFloat asFloat;
   bool asBoolean;
   JsonUInt asUnsignedInteger;
   JsonInteger asSignedInteger;
+  ArrayData asArray;
+  ObjectData asObject;
   CollectionData asCollection;
-  struct {
-    const char* data;
-    size_t size;
-  } asString;
+  const char* asLinkedString;
+  struct StringNode* asOwnedString;
 };
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp
index 7ef218c00..5cc7de18d 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantData.hpp
@@ -1,18 +1,22 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
-#include <ArduinoJson/Memory/MemoryPool.hpp>
+#include <ArduinoJson/Memory/StringNode.hpp>
 #include <ArduinoJson/Misc/SerializedValue.hpp>
 #include <ArduinoJson/Numbers/convertNumber.hpp>
 #include <ArduinoJson/Strings/JsonString.hpp>
 #include <ArduinoJson/Strings/StringAdapters.hpp>
 #include <ArduinoJson/Variant/VariantContent.hpp>
+#include <ArduinoJson/Variant/VariantSlot.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
+template <typename T>
+T parseNumber(const char* s);
+
 class VariantData {
   VariantContent content_;  // must be first to allow cast from array to variant
   uint8_t flags_;
@@ -20,78 +24,207 @@ class VariantData {
  public:
   VariantData() : flags_(VALUE_IS_NULL) {}
 
-  void operator=(const VariantData& src) {
-    content_ = src.content_;
-    flags_ = uint8_t((flags_ & OWNED_KEY_BIT) | (src.flags_ & ~OWNED_KEY_BIT));
+  template <typename TVisitor>
+  typename TVisitor::result_type accept(TVisitor& visit) const {
+    switch (type()) {
+      case VALUE_IS_FLOAT:
+        return visit.visit(content_.asFloat);
+
+      case VALUE_IS_ARRAY:
+        return visit.visit(content_.asArray);
+
+      case VALUE_IS_OBJECT:
+        return visit.visit(content_.asObject);
+
+      case VALUE_IS_LINKED_STRING:
+        return visit.visit(JsonString(content_.asLinkedString));
+
+      case VALUE_IS_OWNED_STRING:
+        return visit.visit(JsonString(content_.asOwnedString->data,
+                                      content_.asOwnedString->length,
+                                      JsonString::Copied));
+
+      case VALUE_IS_RAW_STRING:
+        return visit.visit(RawString(content_.asOwnedString->data,
+                                     content_.asOwnedString->length));
+
+      case VALUE_IS_SIGNED_INTEGER:
+        return visit.visit(content_.asSignedInteger);
+
+      case VALUE_IS_UNSIGNED_INTEGER:
+        return visit.visit(content_.asUnsignedInteger);
+
+      case VALUE_IS_BOOLEAN:
+        return visit.visit(content_.asBoolean != 0);
+
+      default:
+        return visit.visit(nullptr);
+    }
   }
 
   template <typename TVisitor>
-  typename TVisitor::result_type accept(TVisitor& visitor) const {
+  static typename TVisitor::result_type accept(const VariantData* var,
+                                               TVisitor& visit) {
+    if (var != 0)
+      return var->accept(visit);
+    else
+      return visit.visit(nullptr);
+  }
+
+  VariantData* addElement(ResourceManager* resources) {
+    auto array = isNull() ? &toArray() : asArray();
+    return detail::ArrayData::addElement(array, resources);
+  }
+
+  static VariantData* addElement(VariantData* var, ResourceManager* resources) {
+    if (!var)
+      return nullptr;
+    return var->addElement(resources);
+  }
+
+  bool asBoolean() const {
     switch (type()) {
+      case VALUE_IS_BOOLEAN:
+        return content_.asBoolean;
+      case VALUE_IS_SIGNED_INTEGER:
+      case VALUE_IS_UNSIGNED_INTEGER:
+        return content_.asUnsignedInteger != 0;
       case VALUE_IS_FLOAT:
-        return visitor.visitFloat(content_.asFloat);
+        return content_.asFloat != 0;
+      case VALUE_IS_NULL:
+        return false;
+      default:
+        return true;
+    }
+  }
 
-      case VALUE_IS_ARRAY:
-        return visitor.visitArray(content_.asCollection);
+  ArrayData* asArray() {
+    return isArray() ? &content_.asArray : 0;
+  }
 
-      case VALUE_IS_OBJECT:
-        return visitor.visitObject(content_.asCollection);
+  const ArrayData* asArray() const {
+    return const_cast<VariantData*>(this)->asArray();
+  }
 
+  CollectionData* asCollection() {
+    return isCollection() ? &content_.asCollection : 0;
+  }
+
+  const CollectionData* asCollection() const {
+    return const_cast<VariantData*>(this)->asCollection();
+  }
+
+  template <typename T>
+  T asFloat() const {
+    static_assert(is_floating_point<T>::value, "T must be a floating point");
+    switch (type()) {
+      case VALUE_IS_BOOLEAN:
+        return static_cast<T>(content_.asBoolean);
+      case VALUE_IS_UNSIGNED_INTEGER:
+        return static_cast<T>(content_.asUnsignedInteger);
+      case VALUE_IS_SIGNED_INTEGER:
+        return static_cast<T>(content_.asSignedInteger);
       case VALUE_IS_LINKED_STRING:
       case VALUE_IS_OWNED_STRING:
-        return visitor.visitString(content_.asString.data,
-                                   content_.asString.size);
-
-      case VALUE_IS_OWNED_RAW:
-      case VALUE_IS_LINKED_RAW:
-        return visitor.visitRawJson(content_.asString.data,
-                                    content_.asString.size);
-
-      case VALUE_IS_SIGNED_INTEGER:
-        return visitor.visitSignedInteger(content_.asSignedInteger);
-
-      case VALUE_IS_UNSIGNED_INTEGER:
-        return visitor.visitUnsignedInteger(content_.asUnsignedInteger);
-
-      case VALUE_IS_BOOLEAN:
-        return visitor.visitBoolean(content_.asBoolean != 0);
-
+        return parseNumber<T>(content_.asOwnedString->data);
+      case VALUE_IS_FLOAT:
+        return static_cast<T>(content_.asFloat);
       default:
-        return visitor.visitNull();
+        return 0;
     }
   }
 
   template <typename T>
-  T asIntegral() const;
-
-  template <typename T>
-  T asFloat() const;
-
-  JsonString asString() const;
-
-  bool asBoolean() const;
-
-  CollectionData* asArray() {
-    return isArray() ? &content_.asCollection : 0;
+  T asIntegral() const {
+    static_assert(is_integral<T>::value, "T must be an integral type");
+    switch (type()) {
+      case VALUE_IS_BOOLEAN:
+        return content_.asBoolean;
+      case VALUE_IS_UNSIGNED_INTEGER:
+        return convertNumber<T>(content_.asUnsignedInteger);
+      case VALUE_IS_SIGNED_INTEGER:
+        return convertNumber<T>(content_.asSignedInteger);
+      case VALUE_IS_LINKED_STRING:
+        return parseNumber<T>(content_.asLinkedString);
+      case VALUE_IS_OWNED_STRING:
+        return parseNumber<T>(content_.asOwnedString->data);
+      case VALUE_IS_FLOAT:
+        return convertNumber<T>(content_.asFloat);
+      default:
+        return 0;
+    }
   }
 
-  const CollectionData* asArray() const {
-    return const_cast<VariantData*>(this)->asArray();
+  ObjectData* asObject() {
+    return isObject() ? &content_.asObject : 0;
   }
 
-  const CollectionData* asCollection() const {
-    return isCollection() ? &content_.asCollection : 0;
-  }
-
-  CollectionData* asObject() {
-    return isObject() ? &content_.asCollection : 0;
-  }
-
-  const CollectionData* asObject() const {
+  const ObjectData* asObject() const {
     return const_cast<VariantData*>(this)->asObject();
   }
 
-  bool copyFrom(const VariantData& src, MemoryPool* pool);
+  JsonString asRawString() const {
+    switch (type()) {
+      case VALUE_IS_RAW_STRING:
+        return JsonString(content_.asOwnedString->data,
+                          content_.asOwnedString->length, JsonString::Copied);
+      default:
+        return JsonString();
+    }
+  }
+
+  JsonString asString() const {
+    switch (type()) {
+      case VALUE_IS_LINKED_STRING:
+        return JsonString(content_.asLinkedString, JsonString::Linked);
+      case VALUE_IS_OWNED_STRING:
+        return JsonString(content_.asOwnedString->data,
+                          content_.asOwnedString->length, JsonString::Copied);
+      default:
+        return JsonString();
+    }
+  }
+
+  VariantData* getElement(size_t index,
+                          const ResourceManager* resources) const {
+    return ArrayData::getElement(asArray(), index, resources);
+  }
+
+  static VariantData* getElement(const VariantData* var, size_t index,
+                                 const ResourceManager* resources) {
+    return var != 0 ? var->getElement(index, resources) : 0;
+  }
+
+  template <typename TAdaptedString>
+  VariantData* getMember(TAdaptedString key,
+                         const ResourceManager* resources) const {
+    return ObjectData::getMember(asObject(), key, resources);
+  }
+
+  template <typename TAdaptedString>
+  static VariantData* getMember(const VariantData* var, TAdaptedString key,
+                                const ResourceManager* resources) {
+    if (!var)
+      return 0;
+    return var->getMember(key, resources);
+  }
+
+  VariantData* getOrAddElement(size_t index, ResourceManager* resources) {
+    auto array = isNull() ? &toArray() : asArray();
+    if (!array)
+      return nullptr;
+    return array->getOrAddElement(index, resources);
+  }
+
+  template <typename TAdaptedString>
+  VariantData* getOrAddMember(TAdaptedString key, ResourceManager* resources) {
+    if (key.isNull())
+      return nullptr;
+    auto obj = isNull() ? &toObject() : asObject();
+    if (!obj)
+      return nullptr;
+    return obj->getOrAddMember(key, resources);
+  }
 
   bool isArray() const {
     return (flags_ & VALUE_IS_ARRAY) != 0;
@@ -105,6 +238,10 @@ class VariantData {
     return (flags_ & COLLECTION_MASK) != 0;
   }
 
+  bool isFloat() const {
+    return (flags_ & NUMBER_BIT) != 0;
+  }
+
   template <typename T>
   bool isInteger() const {
     switch (type()) {
@@ -119,35 +256,65 @@ class VariantData {
     }
   }
 
-  bool isFloat() const {
-    return (flags_ & NUMBER_BIT) != 0;
+  bool isNull() const {
+    return type() == VALUE_IS_NULL;
   }
 
-  bool isString() const {
-    return type() == VALUE_IS_LINKED_STRING || type() == VALUE_IS_OWNED_STRING;
+  static bool isNull(const VariantData* var) {
+    if (!var)
+      return true;
+    return var->isNull();
   }
 
   bool isObject() const {
     return (flags_ & VALUE_IS_OBJECT) != 0;
   }
 
-  bool isNull() const {
-    return type() == VALUE_IS_NULL;
+  bool isString() const {
+    return type() == VALUE_IS_LINKED_STRING || type() == VALUE_IS_OWNED_STRING;
   }
 
-  bool isEnclosed() const {
-    return !isFloat();
+  size_t nesting(const ResourceManager* resources) const {
+    auto collection = asCollection();
+    if (collection)
+      return collection->nesting(resources);
+    else
+      return 0;
   }
 
-  void remove(size_t index) {
-    if (isArray())
-      content_.asCollection.removeElement(index);
+  static size_t nesting(const VariantData* var,
+                        const ResourceManager* resources) {
+    if (!var)
+      return 0;
+    return var->nesting(resources);
+  }
+
+  void removeElement(size_t index, ResourceManager* resources) {
+    ArrayData::removeElement(asArray(), index, resources);
+  }
+
+  static void removeElement(VariantData* var, size_t index,
+                            ResourceManager* resources) {
+    if (!var)
+      return;
+    var->removeElement(index, resources);
   }
 
   template <typename TAdaptedString>
-  void remove(TAdaptedString key) {
-    if (isObject())
-      content_.asCollection.removeMember(key);
+  void removeMember(TAdaptedString key, ResourceManager* resources) {
+    ObjectData::removeMember(asObject(), key, resources);
+  }
+
+  template <typename TAdaptedString>
+  static void removeMember(VariantData* var, TAdaptedString key,
+                           ResourceManager* resources) {
+    if (!var)
+      return;
+    var->removeMember(key, resources);
+  }
+
+  void reset() {
+    flags_ = VALUE_IS_NULL;
   }
 
   void setBoolean(bool value) {
@@ -155,33 +322,25 @@ class VariantData {
     content_.asBoolean = value;
   }
 
+  void setBoolean(bool value, ResourceManager* resources) {
+    release(resources);
+    setBoolean(value);
+  }
+
   void setFloat(JsonFloat value) {
     setType(VALUE_IS_FLOAT);
     content_.asFloat = value;
   }
 
-  void setLinkedRaw(SerializedValue<const char*> value) {
-    if (value.data()) {
-      setType(VALUE_IS_LINKED_RAW);
-      content_.asString.data = value.data();
-      content_.asString.size = value.size();
-    } else {
-      setType(VALUE_IS_NULL);
-    }
+  void setFloat(JsonFloat value, ResourceManager* resources) {
+    release(resources);
+    setFloat(value);
   }
 
   template <typename T>
-  bool storeOwnedRaw(SerializedValue<T> value, MemoryPool* pool) {
-    const char* dup = pool->saveString(adaptString(value.data(), value.size()));
-    if (dup) {
-      setType(VALUE_IS_OWNED_RAW);
-      content_.asString.data = dup;
-      content_.asString.size = value.size();
-      return true;
-    } else {
-      setType(VALUE_IS_NULL);
-      return false;
-    }
+  typename enable_if<is_signed<T>::value>::type setInteger(T value) {
+    setType(VALUE_IS_SIGNED_INTEGER);
+    content_.asSignedInteger = value;
   }
 
   template <typename T>
@@ -191,132 +350,147 @@ class VariantData {
   }
 
   template <typename T>
-  typename enable_if<is_signed<T>::value>::type setInteger(T value) {
-    setType(VALUE_IS_SIGNED_INTEGER);
-    content_.asSignedInteger = value;
+  void setInteger(T value, ResourceManager* resources) {
+    release(resources);
+    setInteger(value);
   }
 
   void setNull() {
     setType(VALUE_IS_NULL);
   }
 
-  void setString(JsonString s) {
+  void setNull(ResourceManager* resources) {
+    release(resources);
+    setNull();
+  }
+
+  static void setNull(VariantData* var, ResourceManager* resources) {
+    if (!var)
+      return;
+    var->setNull(resources);
+  }
+
+  void setRawString(StringNode* s) {
     ARDUINOJSON_ASSERT(s);
-    if (s.isLinked())
-      setType(VALUE_IS_LINKED_STRING);
+    setType(VALUE_IS_RAW_STRING);
+    content_.asOwnedString = s;
+  }
+
+  template <typename T>
+  void setRawString(SerializedValue<T> value, ResourceManager* resources) {
+    release(resources);
+    auto dup = resources->saveString(adaptString(value.data(), value.size()));
+    if (dup)
+      setRawString(dup);
     else
-      setType(VALUE_IS_OWNED_STRING);
-    content_.asString.data = s.c_str();
-    content_.asString.size = s.size();
+      setNull();
   }
 
-  CollectionData& toArray() {
-    setType(VALUE_IS_ARRAY);
-    content_.asCollection.clear();
-    return content_.asCollection;
+  template <typename T>
+  static void setRawString(VariantData* var, SerializedValue<T> value,
+                           ResourceManager* resources) {
+    if (!var)
+      return;
+    var->setRawString(value, resources);
   }
 
-  CollectionData& toObject() {
-    setType(VALUE_IS_OBJECT);
-    content_.asCollection.clear();
-    return content_.asCollection;
-  }
+  template <typename TAdaptedString>
+  void setString(TAdaptedString value, ResourceManager* resources) {
+    setNull(resources);
 
-  size_t memoryUsage() const {
-    switch (type()) {
-      case VALUE_IS_OWNED_STRING:
-      case VALUE_IS_OWNED_RAW:
-        // We always add a zero at the end: the deduplication function uses it
-        // to detect the beginning of the next string.
-        return content_.asString.size + 1;
-      case VALUE_IS_OBJECT:
-      case VALUE_IS_ARRAY:
-        return content_.asCollection.memoryUsage();
-      default:
-        return 0;
+    if (value.isNull())
+      return;
+
+    if (value.isLinked()) {
+      setLinkedString(value.data());
+      return;
     }
-  }
 
-  size_t size() const {
-    return isCollection() ? content_.asCollection.size() : 0;
-  }
-
-  VariantData* addElement(MemoryPool* pool) {
-    if (isNull())
-      toArray();
-    if (!isArray())
-      return 0;
-    return content_.asCollection.addElement(pool);
-  }
-
-  VariantData* getElement(size_t index) const {
-    const CollectionData* col = asArray();
-    return col ? col->getElement(index) : 0;
-  }
-
-  VariantData* getOrAddElement(size_t index, MemoryPool* pool) {
-    if (isNull())
-      toArray();
-    if (!isArray())
-      return 0;
-    return content_.asCollection.getOrAddElement(index, pool);
+    auto dup = resources->saveString(value);
+    if (dup)
+      setOwnedString(dup);
   }
 
   template <typename TAdaptedString>
-  VariantData* getMember(TAdaptedString key) const {
-    const CollectionData* col = asObject();
-    return col ? col->getMember(key) : 0;
+  static void setString(VariantData* var, TAdaptedString value,
+                        ResourceManager* resources) {
+    if (!var)
+      return;
+    var->setString(value, resources);
   }
 
-  template <typename TAdaptedString>
-  VariantData* getOrAddMember(TAdaptedString key, MemoryPool* pool) {
-    if (isNull())
-      toObject();
-    if (!isObject())
+  void setLinkedString(const char* s) {
+    ARDUINOJSON_ASSERT(s);
+    setType(VALUE_IS_LINKED_STRING);
+    content_.asLinkedString = s;
+  }
+
+  void setOwnedString(StringNode* s) {
+    ARDUINOJSON_ASSERT(s);
+    setType(VALUE_IS_OWNED_STRING);
+    content_.asOwnedString = s;
+  }
+
+  size_t size(const ResourceManager* resources) const {
+    return isCollection() ? content_.asCollection.size(resources) : 0;
+  }
+
+  static size_t size(const VariantData* var, const ResourceManager* resources) {
+    return var != 0 ? var->size(resources) : 0;
+  }
+
+  ArrayData& toArray() {
+    setType(VALUE_IS_ARRAY);
+    new (&content_.asArray) ArrayData();
+    return content_.asArray;
+  }
+
+  ArrayData& toArray(ResourceManager* resources) {
+    release(resources);
+    return toArray();
+  }
+
+  static ArrayData* toArray(VariantData* var, ResourceManager* resources) {
+    if (!var)
       return 0;
-    return content_.asCollection.getOrAddMember(key, pool);
+    return &var->toArray(resources);
   }
 
-  void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
-    if (flags_ & OWNED_VALUE_BIT)
-      content_.asString.data += stringDistance;
-    if (flags_ & COLLECTION_MASK)
-      content_.asCollection.movePointers(stringDistance, variantDistance);
+  ObjectData& toObject() {
+    setType(VALUE_IS_OBJECT);
+    new (&content_.asObject) ObjectData();
+    return content_.asObject;
+  }
+
+  ObjectData& toObject(ResourceManager* resources) {
+    release(resources);
+    return toObject();
+  }
+
+  static ObjectData* toObject(VariantData* var, ResourceManager* resources) {
+    if (!var)
+      return 0;
+    return &var->toObject(resources);
   }
 
   uint8_t type() const {
     return flags_ & VALUE_MASK;
   }
 
-  template <typename TAdaptedString>
-  inline bool setString(TAdaptedString value, MemoryPool* pool) {
-    if (value.isNull()) {
-      setNull();
-      return true;
-    }
+ private:
+  void release(ResourceManager* resources) {
+    if (flags_ & OWNED_VALUE_BIT)
+      resources->dereferenceString(content_.asOwnedString->data);
 
-    return storeString(pool, value, VariantStringSetter(this));
+    auto collection = asCollection();
+    if (collection)
+      collection->clear(resources);
   }
 
- private:
   void setType(uint8_t t) {
     flags_ &= OWNED_KEY_BIT;
     flags_ |= t;
   }
-
-  struct VariantStringSetter {
-    VariantStringSetter(VariantData* instance) : instance_(instance) {}
-
-    template <typename TStoredString>
-    void operator()(TStoredString s) {
-      if (s)
-        instance_->setString(s);
-      else
-        instance_->setNull();
-    }
-
-    VariantData* instance_;
-  };
 };
 
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantDataVisitor.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantDataVisitor.hpp
new file mode 100644
index 000000000..631bce7ca
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantDataVisitor.hpp
@@ -0,0 +1,24 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/ArrayData.hpp>
+#include <ArduinoJson/Numbers/JsonFloat.hpp>
+#include <ArduinoJson/Numbers/JsonInteger.hpp>
+#include <ArduinoJson/Object/ObjectData.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+template <typename TResult>
+struct VariantDataVisitor {
+  typedef TResult result_type;
+
+  template <typename T>
+  TResult visit(const T&) {
+    return TResult();
+  }
+};
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp
deleted file mode 100644
index c0c919577..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantFunctions.hpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Polyfills/attributes.hpp>
-#include <ArduinoJson/Strings/StoragePolicy.hpp>
-#include <ArduinoJson/Variant/VariantData.hpp>
-#include <ArduinoJson/Variant/Visitor.hpp>
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-template <typename TVisitor>
-inline typename TVisitor::result_type variantAccept(const VariantData* var,
-                                                    TVisitor& visitor) {
-  if (var != 0)
-    return var->accept(visitor);
-  else
-    return visitor.visitNull();
-}
-
-inline bool variantCopyFrom(VariantData* dst, const VariantData* src,
-                            MemoryPool* pool) {
-  if (!dst)
-    return false;
-  if (!src) {
-    dst->setNull();
-    return true;
-  }
-  return dst->copyFrom(*src, pool);
-}
-
-inline void variantSetNull(VariantData* var) {
-  if (!var)
-    return;
-  var->setNull();
-}
-
-template <typename TAdaptedString>
-inline bool variantSetString(VariantData* var, TAdaptedString value,
-                             MemoryPool* pool) {
-  return var != 0 ? var->setString(value, pool) : 0;
-}
-
-inline size_t variantSize(const VariantData* var) {
-  return var != 0 ? var->size() : 0;
-}
-
-inline CollectionData* variantToArray(VariantData* var) {
-  if (!var)
-    return 0;
-  return &var->toArray();
-}
-
-inline CollectionData* variantToObject(VariantData* var) {
-  if (!var)
-    return 0;
-  return &var->toObject();
-}
-
-inline VariantData* variantGetElement(const VariantData* var, size_t index) {
-  return var != 0 ? var->getElement(index) : 0;
-}
-
-inline NO_INLINE VariantData* variantAddElement(VariantData* var,
-                                                MemoryPool* pool) {
-  return var != 0 ? var->addElement(pool) : 0;
-}
-
-inline NO_INLINE VariantData* variantGetOrAddElement(VariantData* var,
-                                                     size_t index,
-                                                     MemoryPool* pool) {
-  return var != 0 ? var->getOrAddElement(index, pool) : 0;
-}
-
-template <typename TAdaptedString>
-VariantData* variantGetMember(const VariantData* var, TAdaptedString key) {
-  if (!var)
-    return 0;
-  return var->getMember(key);
-}
-
-template <typename TAdaptedString>
-VariantData* variantGetOrAddMember(VariantData* var, TAdaptedString key,
-                                   MemoryPool* pool) {
-  if (!var)
-    return 0;
-  return var->getOrAddMember(key, pool);
-}
-
-inline bool variantIsNull(const VariantData* var) {
-  return var == 0 || var->isNull();
-}
-
-inline size_t variantNesting(const VariantData* var) {
-  if (!var)
-    return 0;
-
-  const CollectionData* collection = var->asCollection();
-  if (!collection)
-    return 0;
-
-  size_t maxChildNesting = 0;
-  for (const VariantSlot* s = collection->head(); s; s = s->next()) {
-    size_t childNesting = variantNesting(s->data());
-    if (childNesting > maxChildNesting)
-      maxChildNesting = childNesting;
-  }
-  return maxChildNesting + 1;
-}
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp
deleted file mode 100644
index c122a2f45..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantImpl.hpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Array/JsonArray.hpp>
-#include <ArduinoJson/Configuration.hpp>
-#include <ArduinoJson/Numbers/convertNumber.hpp>
-#include <ArduinoJson/Numbers/parseNumber.hpp>
-#include <ArduinoJson/Object/JsonObject.hpp>
-#include <ArduinoJson/Variant/JsonVariant.hpp>
-
-#include <string.h>  // for strcmp
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-template <typename T>
-inline T VariantData::asIntegral() const {
-  switch (type()) {
-    case VALUE_IS_BOOLEAN:
-      return content_.asBoolean;
-    case VALUE_IS_UNSIGNED_INTEGER:
-      return convertNumber<T>(content_.asUnsignedInteger);
-    case VALUE_IS_SIGNED_INTEGER:
-      return convertNumber<T>(content_.asSignedInteger);
-    case VALUE_IS_LINKED_STRING:
-    case VALUE_IS_OWNED_STRING:
-      return parseNumber<T>(content_.asString.data);
-    case VALUE_IS_FLOAT:
-      return convertNumber<T>(content_.asFloat);
-    default:
-      return 0;
-  }
-}
-
-inline bool VariantData::asBoolean() const {
-  switch (type()) {
-    case VALUE_IS_BOOLEAN:
-      return content_.asBoolean;
-    case VALUE_IS_SIGNED_INTEGER:
-    case VALUE_IS_UNSIGNED_INTEGER:
-      return content_.asUnsignedInteger != 0;
-    case VALUE_IS_FLOAT:
-      return content_.asFloat != 0;
-    case VALUE_IS_NULL:
-      return false;
-    default:
-      return true;
-  }
-}
-
-// T = float/double
-template <typename T>
-inline T VariantData::asFloat() const {
-  switch (type()) {
-    case VALUE_IS_BOOLEAN:
-      return static_cast<T>(content_.asBoolean);
-    case VALUE_IS_UNSIGNED_INTEGER:
-      return static_cast<T>(content_.asUnsignedInteger);
-    case VALUE_IS_SIGNED_INTEGER:
-      return static_cast<T>(content_.asSignedInteger);
-    case VALUE_IS_LINKED_STRING:
-    case VALUE_IS_OWNED_STRING:
-      return parseNumber<T>(content_.asString.data);
-    case VALUE_IS_FLOAT:
-      return static_cast<T>(content_.asFloat);
-    default:
-      return 0;
-  }
-}
-
-inline JsonString VariantData::asString() const {
-  switch (type()) {
-    case VALUE_IS_LINKED_STRING:
-      return JsonString(content_.asString.data, content_.asString.size,
-                        JsonString::Linked);
-    case VALUE_IS_OWNED_STRING:
-      return JsonString(content_.asString.data, content_.asString.size,
-                        JsonString::Copied);
-    default:
-      return JsonString();
-  }
-}
-
-inline bool VariantData::copyFrom(const VariantData& src, MemoryPool* pool) {
-  switch (src.type()) {
-    case VALUE_IS_ARRAY:
-      return toArray().copyFrom(src.content_.asCollection, pool);
-    case VALUE_IS_OBJECT:
-      return toObject().copyFrom(src.content_.asCollection, pool);
-    case VALUE_IS_OWNED_STRING: {
-      JsonString value = src.asString();
-      return setString(adaptString(value), pool);
-    }
-    case VALUE_IS_OWNED_RAW:
-      return storeOwnedRaw(
-          serialized(src.content_.asString.data, src.content_.asString.size),
-          pool);
-    default:
-      setType(src.type());
-      content_ = src.content_;
-      return true;
-  }
-}
-
-template <typename TDerived>
-inline JsonVariant VariantRefBase<TDerived>::add() const {
-  return JsonVariant(getPool(),
-                     variantAddElement(getOrCreateData(), getPool()));
-}
-
-template <typename TDerived>
-inline JsonVariant VariantRefBase<TDerived>::getVariant() const {
-  return JsonVariant(getPool(), getData());
-}
-
-template <typename TDerived>
-inline JsonVariant VariantRefBase<TDerived>::getOrCreateVariant() const {
-  return JsonVariant(getPool(), getOrCreateData());
-}
-
-template <typename TDerived>
-template <typename T>
-inline typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type
-VariantRefBase<TDerived>::to() const {
-  return JsonArray(getPool(), variantToArray(getOrCreateData()));
-}
-
-template <typename TDerived>
-template <typename T>
-typename enable_if<is_same<T, JsonObject>::value, JsonObject>::type
-VariantRefBase<TDerived>::to() const {
-  return JsonObject(getPool(), variantToObject(getOrCreateData()));
-}
-
-template <typename TDerived>
-template <typename T>
-typename enable_if<is_same<T, JsonVariant>::value, JsonVariant>::type
-VariantRefBase<TDerived>::to() const {
-  auto data = getOrCreateData();
-  variantSetNull(data);
-  return JsonVariant(getPool(), data);
-}
-
-template <typename TDerived>
-inline void convertToJson(const VariantRefBase<TDerived>& src,
-                          JsonVariant dst) {
-  dst.set(src.template as<JsonVariantConst>());
-}
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantOperators.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantOperators.hpp
index a352f0c41..d5d484a85 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantOperators.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantOperators.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBase.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBase.hpp
index 2afdda6a4..c81334af2 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBase.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBase.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
@@ -27,16 +27,15 @@ class VariantRefBase : public VariantTag {
 
  public:
   // Sets the value to null.
-  // ⚠️ Doesn't release the memory associated with the previous value.
-  // https://arduinojson.org/v6/api/jsonvariant/clear/
+  // https://arduinojson.org/v7/api/jsonvariant/clear/
   FORCE_INLINE void clear() const {
-    variantSetNull(getData());
+    VariantData::setNull(getOrCreateData(), getResourceManager());
   }
 
   // Returns true if the value is null or the reference is unbound.
-  // https://arduinojson.org/v6/api/jsonvariant/isnull/
+  // https://arduinojson.org/v7/api/jsonvariant/isnull/
   FORCE_INLINE bool isNull() const {
-    return variantIsNull(getData());
+    return VariantData::isNull(getData());
   }
 
   // Returns true if the reference is unbound.
@@ -45,7 +44,7 @@ class VariantRefBase : public VariantTag {
   }
 
   // Casts the value to the specified type.
-  // https://arduinojson.org/v6/api/jsonvariant/as/
+  // https://arduinojson.org/v7/api/jsonvariant/as/
   template <typename T>
   FORCE_INLINE
       typename enable_if<!ConverterNeedsWriteableRef<T>::value, T>::type
@@ -54,49 +53,43 @@ class VariantRefBase : public VariantTag {
   }
 
   // Casts the value to the specified type.
-  // https://arduinojson.org/v6/api/jsonvariant/as/
+  // https://arduinojson.org/v7/api/jsonvariant/as/
   template <typename T>
   FORCE_INLINE typename enable_if<ConverterNeedsWriteableRef<T>::value, T>::type
-  as() const {
-    return Converter<T>::fromJson(getVariant());
-  }
+  as() const;
 
-  template <typename T>
+  template <typename T,
+            typename = typename enable_if<!is_same<T, TDerived>::value>::type>
   FORCE_INLINE operator T() const {
     return as<T>();
   }
 
   // Sets the value to an empty array.
-  // ⚠️ Doesn't release the memory associated with the previous value.
-  // https://arduinojson.org/v6/api/jsonvariant/to/
+  // https://arduinojson.org/v7/api/jsonvariant/to/
   template <typename T>
   typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type to() const;
 
   // Sets the value to an empty object.
-  // ⚠️ Doesn't release the memory associated with the previous value.
-  // https://arduinojson.org/v6/api/jsonvariant/to/
+  // https://arduinojson.org/v7/api/jsonvariant/to/
   template <typename T>
   typename enable_if<is_same<T, JsonObject>::value, JsonObject>::type to()
       const;
 
   // Sets the value to null.
-  // ⚠️ Doesn't release the memory associated with the previous value.
-  // https://arduinojson.org/v6/api/jsonvariant/to/
+  // https://arduinojson.org/v7/api/jsonvariant/to/
   template <typename T>
   typename enable_if<is_same<T, JsonVariant>::value, JsonVariant>::type to()
       const;
 
   // Returns true if the value is of the specified type.
-  // https://arduinojson.org/v6/api/jsonvariant/is/
+  // https://arduinojson.org/v7/api/jsonvariant/is/
   template <typename T>
   FORCE_INLINE
       typename enable_if<ConverterNeedsWriteableRef<T>::value, bool>::type
-      is() const {
-    return Converter<T>::checkJson(getVariant());
-  }
+      is() const;
 
   // Returns true if the value is of the specified type.
-  // https://arduinojson.org/v6/api/jsonvariant/is/
+  // https://arduinojson.org/v7/api/jsonvariant/is/
   template <typename T>
   FORCE_INLINE typename enable_if<!ConverterNeedsWriteableRef<T>::value &&
                                       !is_same<T, char*>::value &&
@@ -106,163 +99,153 @@ class VariantRefBase : public VariantTag {
     return Converter<T>::checkJson(getVariantConst());
   }
 
-  // Shallow copies the specified value.
-  // https://arduinojson.org/v6/api/jsonvariant/shallowcopy/
-  FORCE_INLINE void shallowCopy(ArduinoJson::JsonVariantConst target) {
-    VariantData* data = getOrCreateData();
-    if (!data)
-      return;
-    const VariantData* targetData = VariantAttorney::getData(target);
-    if (targetData)
-      *data = *targetData;
-    else
-      data->setNull();
-  }
+  // Copies the specified value.
+  // https://arduinojson.org/v7/api/jsonvariant/set/
+  template <typename T>
+  FORCE_INLINE bool set(const T& value) const;
 
   // Copies the specified value.
-  // https://arduinojson.org/v6/api/jsonvariant/set/
+  // https://arduinojson.org/v7/api/jsonvariant/set/
   template <typename T>
-  FORCE_INLINE bool set(const T& value) const {
-    Converter<T>::toJson(value, getOrCreateVariant());
-    MemoryPool* pool = getPool();
-    return pool && !pool->overflowed();
-  }
-
-  // Copies the specified value.
-  // https://arduinojson.org/v6/api/jsonvariant/set/
-  template <typename T>
-  FORCE_INLINE bool set(T* value) const {
-    Converter<T*>::toJson(value, getOrCreateVariant());
-    MemoryPool* pool = getPool();
-    return pool && !pool->overflowed();
-  }
+  FORCE_INLINE bool set(T* value) const;
 
   // Returns the size of the array or object.
-  // https://arduinojson.org/v6/api/jsonvariant/size/
+  // https://arduinojson.org/v7/api/jsonvariant/size/
   FORCE_INLINE size_t size() const {
-    return variantSize(getData());
-  }
-
-  // Returns the number of bytes occupied by the value.
-  // https://arduinojson.org/v6/api/jsonvariant/memoryusage/
-  FORCE_INLINE size_t memoryUsage() const {
-    VariantData* data = getData();
-    return data ? data->memoryUsage() : 0;
+    return VariantData::size(getData(), getResourceManager());
   }
 
   // Returns the depth (nesting level) of the value.
-  // https://arduinojson.org/v6/api/jsonvariant/nesting/
+  // https://arduinojson.org/v7/api/jsonvariant/nesting/
   FORCE_INLINE size_t nesting() const {
-    return variantNesting(getData());
+    return VariantData::nesting(getData(), getResourceManager());
+  }
+
+  // Appends a new (empty) element to the array.
+  // Returns a reference to the new element.
+  // https://arduinojson.org/v7/api/jsonvariant/add/
+  template <typename T>
+  typename enable_if<!is_same<T, JsonVariant>::value, T>::type add() const {
+    return add<JsonVariant>().template to<T>();
   }
 
   // Appends a new (null) element to the array.
   // Returns a reference to the new element.
-  // https://arduinojson.org/v6/api/jsonvariant/add/
-  FORCE_INLINE JsonVariant add() const;
+  // https://arduinojson.org/v7/api/jsonvariant/add/
+  template <typename T>
+  typename enable_if<is_same<T, JsonVariant>::value, T>::type add() const;
 
   // Appends a value to the array.
-  // https://arduinojson.org/v6/api/jsonvariant/add/
+  // https://arduinojson.org/v7/api/jsonvariant/add/
   template <typename T>
   FORCE_INLINE bool add(const T& value) const {
-    return add().set(value);
+    return add<JsonVariant>().set(value);
   }
 
   // Appends a value to the array.
-  // https://arduinojson.org/v6/api/jsonvariant/add/
+  // https://arduinojson.org/v7/api/jsonvariant/add/
   template <typename T>
   FORCE_INLINE bool add(T* value) const {
-    return add().set(value);
+    return add<JsonVariant>().set(value);
   }
 
   // Removes an element of the array.
-  // ⚠️ Doesn't release the memory associated with the removed element.
-  // https://arduinojson.org/v6/api/jsonvariant/remove/
+  // https://arduinojson.org/v7/api/jsonvariant/remove/
   FORCE_INLINE void remove(size_t index) const {
-    VariantData* data = getData();
-    if (data)
-      data->remove(index);
+    VariantData::removeElement(getData(), index, getResourceManager());
   }
 
   // Removes a member of the object.
-  // ⚠️ Doesn't release the memory associated with the removed element.
-  // https://arduinojson.org/v6/api/jsonvariant/remove/
+  // https://arduinojson.org/v7/api/jsonvariant/remove/
   template <typename TChar>
   FORCE_INLINE typename enable_if<IsString<TChar*>::value>::type remove(
       TChar* key) const {
-    VariantData* data = getData();
-    if (data)
-      data->remove(adaptString(key));
+    VariantData::removeMember(getData(), adaptString(key),
+                              getResourceManager());
   }
 
   // Removes a member of the object.
-  // ⚠️ Doesn't release the memory associated with the removed element.
-  // https://arduinojson.org/v6/api/jsonvariant/remove/
+  // https://arduinojson.org/v7/api/jsonvariant/remove/
   template <typename TString>
   FORCE_INLINE typename enable_if<IsString<TString>::value>::type remove(
       const TString& key) const {
-    VariantData* data = getData();
-    if (data)
-      data->remove(adaptString(key));
+    VariantData::removeMember(getData(), adaptString(key),
+                              getResourceManager());
   }
 
-  // Creates an array and appends it to the array.
-  // https://arduinojson.org/v6/api/jsonvariant/createnestedarray/
-  FORCE_INLINE JsonArray createNestedArray() const;
-
-  // Creates an object and appends it to the array.
-  // https://arduinojson.org/v6/api/jsonvariant/createnestedobject/
-  FORCE_INLINE JsonObject createNestedObject() const;
-
   // Gets or sets an array element.
-  // https://arduinojson.org/v6/api/jsonvariant/subscript/
+  // https://arduinojson.org/v7/api/jsonvariant/subscript/
   FORCE_INLINE ElementProxy<TDerived> operator[](size_t index) const;
 
   // Returns true if the object contains the specified key.
-  // https://arduinojson.org/v6/api/jsonvariant/containskey/
+  // https://arduinojson.org/v7/api/jsonvariant/containskey/
   template <typename TString>
   FORCE_INLINE typename enable_if<IsString<TString>::value, bool>::type
   containsKey(const TString& key) const;
 
   // Returns true if the object contains the specified key.
-  // https://arduinojson.org/v6/api/jsonvariant/containskey/
+  // https://arduinojson.org/v7/api/jsonvariant/containskey/
   template <typename TChar>
   FORCE_INLINE typename enable_if<IsString<TChar*>::value, bool>::type
   containsKey(TChar* key) const;
 
   // Gets or sets an object member.
-  // https://arduinojson.org/v6/api/jsonvariant/subscript/
+  // https://arduinojson.org/v7/api/jsonvariant/subscript/
   template <typename TString>
   FORCE_INLINE typename enable_if<IsString<TString>::value,
                                   MemberProxy<TDerived, TString>>::type
   operator[](const TString& key) const;
 
   // Gets or sets an object member.
-  // https://arduinojson.org/v6/api/jsonvariant/subscript/
+  // https://arduinojson.org/v7/api/jsonvariant/subscript/
   template <typename TChar>
   FORCE_INLINE typename enable_if<IsString<TChar*>::value,
                                   MemberProxy<TDerived, TChar*>>::type
   operator[](TChar* key) const;
 
-  // Creates an array and adds it to the object.
-  // https://arduinojson.org/v6/api/jsonvariant/createnestedarray/
-  template <typename TString>
-  FORCE_INLINE JsonArray createNestedArray(const TString& key) const;
+  // DEPRECATED: use add<JsonVariant>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonVariant>() instead")
+  JsonVariant add() const;
 
-  // Creates an array and adds it to the object.
-  // https://arduinojson.org/v6/api/jsonvariant/createnestedarray/
+  // DEPRECATED: use add<JsonArray>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonArray>() instead")
+  JsonArray createNestedArray() const;
+
+  // DEPRECATED: use var[key].to<JsonArray>() instead
   template <typename TChar>
-  FORCE_INLINE JsonArray createNestedArray(TChar* key) const;
+  ARDUINOJSON_DEPRECATED("use var[key].to<JsonArray>() instead")
+  JsonArray createNestedArray(TChar* key) const;
 
-  // Creates an object and adds it to the object.
-  // https://arduinojson.org/v6/api/jsonvariant/createnestedobject/
+  // DEPRECATED: use var[key].to<JsonArray>() instead
   template <typename TString>
+  ARDUINOJSON_DEPRECATED("use var[key].to<JsonArray>() instead")
+  JsonArray createNestedArray(const TString& key) const;
+
+  // DEPRECATED: use add<JsonObject>() instead
+  ARDUINOJSON_DEPRECATED("use add<JsonObject>() instead")
+  JsonObject createNestedObject() const;
+
+  // DEPRECATED: use var[key].to<JsonObject>() instead
+  template <typename TChar>
+  ARDUINOJSON_DEPRECATED("use var[key].to<JsonObject>() instead")
+  JsonObject createNestedObject(TChar* key) const;
+
+  // DEPRECATED: use var[key].to<JsonObject>() instead
+  template <typename TString>
+  ARDUINOJSON_DEPRECATED("use var[key].to<JsonObject>() instead")
   JsonObject createNestedObject(const TString& key) const;
 
-  // Creates an object and adds it to the object.
-  // https://arduinojson.org/v6/api/jsonvariant/createnestedobject/
-  template <typename TChar>
-  JsonObject createNestedObject(TChar* key) const;
+  // DEPRECATED: always returns zero
+  ARDUINOJSON_DEPRECATED("always returns zero")
+  size_t memoryUsage() const {
+    return 0;
+  }
+
+  // DEPRECATED: performs a deep copy
+  ARDUINOJSON_DEPRECATED("performs a deep copy")
+  void shallowCopy(JsonVariantConst src) const {
+    set(src);
+  }
 
  private:
   TDerived& derived() {
@@ -273,8 +256,8 @@ class VariantRefBase : public VariantTag {
     return static_cast<const TDerived&>(*this);
   }
 
-  FORCE_INLINE MemoryPool* getPool() const {
-    return VariantAttorney::getPool(derived());
+  FORCE_INLINE ResourceManager* getResourceManager() const {
+    return VariantAttorney::getResourceManager(derived());
   }
 
   FORCE_INLINE VariantData* getData() const {
@@ -285,11 +268,10 @@ class VariantRefBase : public VariantTag {
     return VariantAttorney::getOrCreateData(derived());
   }
 
- private:
   FORCE_INLINE ArduinoJson::JsonVariant getVariant() const;
 
   FORCE_INLINE ArduinoJson::JsonVariantConst getVariantConst() const {
-    return ArduinoJson::JsonVariantConst(getData());
+    return ArduinoJson::JsonVariantConst(getData(), getResourceManager());
   }
 
   FORCE_INLINE ArduinoJson::JsonVariant getOrCreateVariant() const;
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp
new file mode 100644
index 000000000..89e0edecf
--- /dev/null
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantRefBaseImpl.hpp
@@ -0,0 +1,177 @@
+// ArduinoJson - https://arduinojson.org
+// Copyright © 2014-2024, Benoit BLANCHON
+// MIT License
+
+#pragma once
+
+#include <ArduinoJson/Array/JsonArray.hpp>
+#include <ArduinoJson/Object/JsonObject.hpp>
+#include <ArduinoJson/Variant/VariantRefBase.hpp>
+
+ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
+
+template <typename TDerived>
+inline JsonVariant VariantRefBase<TDerived>::add() const {
+  return add<JsonVariant>();
+}
+
+template <typename TDerived>
+template <typename T>
+inline typename enable_if<ConverterNeedsWriteableRef<T>::value, T>::type
+VariantRefBase<TDerived>::as() const {
+  return Converter<T>::fromJson(getVariant());
+}
+
+template <typename TDerived>
+inline JsonArray VariantRefBase<TDerived>::createNestedArray() const {
+  return add<JsonArray>();
+}
+
+template <typename TDerived>
+template <typename TChar>
+inline JsonArray VariantRefBase<TDerived>::createNestedArray(TChar* key) const {
+  return operator[](key).template to<JsonArray>();
+}
+
+template <typename TDerived>
+template <typename TString>
+inline JsonArray VariantRefBase<TDerived>::createNestedArray(
+    const TString& key) const {
+  return operator[](key).template to<JsonArray>();
+}
+
+template <typename TDerived>
+inline JsonObject VariantRefBase<TDerived>::createNestedObject() const {
+  return add<JsonObject>();
+}
+
+template <typename TDerived>
+template <typename TChar>
+inline JsonObject VariantRefBase<TDerived>::createNestedObject(
+    TChar* key) const {
+  return operator[](key).template to<JsonObject>();
+}
+
+template <typename TDerived>
+template <typename TString>
+inline JsonObject VariantRefBase<TDerived>::createNestedObject(
+    const TString& key) const {
+  return operator[](key).template to<JsonObject>();
+}
+
+template <typename TDerived>
+inline void convertToJson(const VariantRefBase<TDerived>& src,
+                          JsonVariant dst) {
+  dst.set(src.template as<JsonVariantConst>());
+}
+
+template <typename TDerived>
+template <typename T>
+inline typename enable_if<is_same<T, JsonVariant>::value, T>::type
+VariantRefBase<TDerived>::add() const {
+  return JsonVariant(
+      detail::VariantData::addElement(getOrCreateData(), getResourceManager()),
+      getResourceManager());
+}
+
+template <typename TDerived>
+template <typename TString>
+inline typename enable_if<IsString<TString>::value, bool>::type
+VariantRefBase<TDerived>::containsKey(const TString& key) const {
+  return VariantData::getMember(getData(), adaptString(key),
+                                getResourceManager()) != 0;
+}
+
+template <typename TDerived>
+template <typename TChar>
+inline typename enable_if<IsString<TChar*>::value, bool>::type
+VariantRefBase<TDerived>::containsKey(TChar* key) const {
+  return VariantData::getMember(getData(), adaptString(key),
+                                getResourceManager()) != 0;
+}
+
+template <typename TDerived>
+inline JsonVariant VariantRefBase<TDerived>::getVariant() const {
+  return JsonVariant(getData(), getResourceManager());
+}
+
+template <typename TDerived>
+inline JsonVariant VariantRefBase<TDerived>::getOrCreateVariant() const {
+  return JsonVariant(getOrCreateData(), getResourceManager());
+}
+
+template <typename TDerived>
+template <typename T>
+inline typename enable_if<ConverterNeedsWriteableRef<T>::value, bool>::type
+VariantRefBase<TDerived>::is() const {
+  return Converter<T>::checkJson(getVariant());
+}
+
+template <typename TDerived>
+inline ElementProxy<TDerived> VariantRefBase<TDerived>::operator[](
+    size_t index) const {
+  return ElementProxy<TDerived>(derived(), index);
+}
+
+template <typename TDerived>
+template <typename TString>
+inline typename enable_if<IsString<TString*>::value,
+                          MemberProxy<TDerived, TString*>>::type
+VariantRefBase<TDerived>::operator[](TString* key) const {
+  return MemberProxy<TDerived, TString*>(derived(), key);
+}
+
+template <typename TDerived>
+template <typename TString>
+inline typename enable_if<IsString<TString>::value,
+                          MemberProxy<TDerived, TString>>::type
+VariantRefBase<TDerived>::operator[](const TString& key) const {
+  return MemberProxy<TDerived, TString>(derived(), key);
+}
+
+template <typename TDerived>
+template <typename T>
+inline bool VariantRefBase<TDerived>::set(const T& value) const {
+  Converter<typename detail::remove_cv<T>::type>::toJson(value,
+                                                         getOrCreateVariant());
+  auto resources = getResourceManager();
+  return resources && !resources->overflowed();
+}
+
+template <typename TDerived>
+template <typename T>
+inline bool VariantRefBase<TDerived>::set(T* value) const {
+  Converter<T*>::toJson(value, getOrCreateVariant());
+  auto resources = getResourceManager();
+  return resources && !resources->overflowed();
+}
+
+template <typename TDerived>
+template <typename T>
+inline typename enable_if<is_same<T, JsonArray>::value, JsonArray>::type
+VariantRefBase<TDerived>::to() const {
+  return JsonArray(
+      VariantData::toArray(getOrCreateData(), getResourceManager()),
+      getResourceManager());
+}
+
+template <typename TDerived>
+template <typename T>
+typename enable_if<is_same<T, JsonObject>::value, JsonObject>::type
+VariantRefBase<TDerived>::to() const {
+  return JsonObject(
+      VariantData::toObject(getOrCreateData(), getResourceManager()),
+      getResourceManager());
+}
+
+template <typename TDerived>
+template <typename T>
+typename enable_if<is_same<T, JsonVariant>::value, JsonVariant>::type
+VariantRefBase<TDerived>::to() const {
+  auto data = getOrCreateData();
+  auto resources = getResourceManager();
+  detail::VariantData::setNull(data, resources);
+  return JsonVariant(data, resources);
+}
+
+ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp
index f88e35bad..35107fd26 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantSlot.hpp
@@ -1,17 +1,17 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
-#include <ArduinoJson/Polyfills/integer.hpp>
+#include <ArduinoJson/Memory/ResourceManager.hpp>
 #include <ArduinoJson/Polyfills/limits.hpp>
 #include <ArduinoJson/Polyfills/type_traits.hpp>
 #include <ArduinoJson/Variant/VariantContent.hpp>
 
 ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
 
-typedef int_t<ARDUINOJSON_SLOT_OFFSET_SIZE * 8>::type VariantSlotDiff;
+struct StringNode;
 
 class VariantSlot {
   // CAUTION: same layout as VariantData
@@ -19,15 +19,18 @@ class VariantSlot {
   // (+20% on ESP8266 for example)
   VariantContent content_;
   uint8_t flags_;
-  VariantSlotDiff next_;
+  SlotId next_;
   const char* key_;
 
  public:
-  // Must be a POD!
-  // - no constructor
-  // - no destructor
-  // - no virtual
-  // - no inheritance
+  // Placement new
+  static void* operator new(size_t, void* p) noexcept {
+    return p;
+  }
+
+  static void operator delete(void*, void*) noexcept {}
+
+  VariantSlot() : flags_(0), next_(NULL_SLOT), key_(0) {}
 
   VariantData* data() {
     return reinterpret_cast<VariantData*>(&content_);
@@ -37,52 +40,24 @@ class VariantSlot {
     return reinterpret_cast<const VariantData*>(&content_);
   }
 
-  VariantSlot* next() {
-    return next_ ? this + next_ : 0;
+  SlotId next() const {
+    return next_;
   }
 
-  const VariantSlot* next() const {
-    return const_cast<VariantSlot*>(this)->next();
+  void setNext(SlotId slot) {
+    next_ = slot;
   }
 
-  VariantSlot* next(size_t distance) {
-    VariantSlot* slot = this;
-    while (distance--) {
-      if (!slot->next_)
-        return 0;
-      slot += slot->next_;
-    }
-    return slot;
-  }
-
-  const VariantSlot* next(size_t distance) const {
-    return const_cast<VariantSlot*>(this)->next(distance);
-  }
-
-  void setNext(VariantSlot* slot) {
-    ARDUINOJSON_ASSERT(!slot || slot - this >=
-                                    numeric_limits<VariantSlotDiff>::lowest());
-    ARDUINOJSON_ASSERT(!slot || slot - this <=
-                                    numeric_limits<VariantSlotDiff>::highest());
-    next_ = VariantSlotDiff(slot ? slot - this : 0);
-  }
-
-  void setNextNotNull(VariantSlot* slot) {
-    ARDUINOJSON_ASSERT(slot != 0);
-    ARDUINOJSON_ASSERT(slot - this >=
-                       numeric_limits<VariantSlotDiff>::lowest());
-    ARDUINOJSON_ASSERT(slot - this <=
-                       numeric_limits<VariantSlotDiff>::highest());
-    next_ = VariantSlotDiff(slot - this);
-  }
-
-  void setKey(JsonString k) {
+  void setKey(const char* k) {
     ARDUINOJSON_ASSERT(k);
-    if (k.isLinked())
-      flags_ &= VALUE_MASK;
-    else
-      flags_ |= OWNED_KEY_BIT;
-    key_ = k.c_str();
+    flags_ &= VALUE_MASK;
+    key_ = k;
+  }
+
+  void setKey(StringNode* k) {
+    ARDUINOJSON_ASSERT(k);
+    flags_ |= OWNED_KEY_BIT;
+    key_ = k->data;
   }
 
   const char* key() const {
@@ -92,21 +67,20 @@ class VariantSlot {
   bool ownsKey() const {
     return (flags_ & OWNED_KEY_BIT) != 0;
   }
-
-  void clear() {
-    next_ = 0;
-    flags_ = 0;
-    key_ = 0;
-  }
-
-  void movePointers(ptrdiff_t stringDistance, ptrdiff_t variantDistance) {
-    if (flags_ & OWNED_KEY_BIT)
-      key_ += stringDistance;
-    if (flags_ & OWNED_VALUE_BIT)
-      content_.asString.data += stringDistance;
-    if (flags_ & COLLECTION_MASK)
-      content_.asCollection.movePointers(stringDistance, variantDistance);
-  }
 };
 
+inline VariantData* slotData(VariantSlot* slot) {
+  return reinterpret_cast<VariantData*>(slot);
+}
+
+// Returns the size (in bytes) of an array with n elements.
+constexpr size_t sizeofArray(size_t n) {
+  return n * sizeof(VariantSlot);
+}
+
+// Returns the size (in bytes) of an object with n members.
+constexpr size_t sizeofObject(size_t n) {
+  return n * sizeof(VariantSlot);
+}
+
 ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTag.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTag.hpp
index 0c5ee40db..23f360f02 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTag.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTag.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp
index 0ca56df60..c533040db 100644
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/Variant/VariantTo.hpp
@@ -1,5 +1,5 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
diff --git a/lib/ArduinoJson/src/ArduinoJson/Variant/Visitor.hpp b/lib/ArduinoJson/src/ArduinoJson/Variant/Visitor.hpp
deleted file mode 100644
index f1c784165..000000000
--- a/lib/ArduinoJson/src/ArduinoJson/Variant/Visitor.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
-// MIT License
-
-#pragma once
-
-#include <ArduinoJson/Collection/CollectionData.hpp>
-#include <ArduinoJson/Numbers/JsonFloat.hpp>
-#include <ArduinoJson/Numbers/JsonInteger.hpp>
-
-ARDUINOJSON_BEGIN_PRIVATE_NAMESPACE
-
-template <typename TResult>
-struct Visitor {
-  typedef TResult result_type;
-
-  TResult visitArray(const CollectionData&) {
-    return TResult();
-  }
-
-  TResult visitBoolean(bool) {
-    return TResult();
-  }
-
-  TResult visitFloat(JsonFloat) {
-    return TResult();
-  }
-
-  TResult visitSignedInteger(JsonInteger) {
-    return TResult();
-  }
-
-  TResult visitNull() {
-    return TResult();
-  }
-
-  TResult visitObject(const CollectionData&) {
-    return TResult();
-  }
-
-  TResult visitUnsignedInteger(JsonUInt) {
-    return TResult();
-  }
-
-  TResult visitRawJson(const char*, size_t) {
-    return TResult();
-  }
-
-  TResult visitString(const char*, size_t) {
-    return TResult();
-  }
-};
-
-ARDUINOJSON_END_PRIVATE_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/compatibility.hpp b/lib/ArduinoJson/src/ArduinoJson/compatibility.hpp
index 85769487d..26be5e72c 100644
--- a/lib/ArduinoJson/src/ArduinoJson/compatibility.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/compatibility.hpp
@@ -1,9 +1,19 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 //
 // clang-format off
 
+#include <ArduinoJson/Namespace.hpp>
+
+#ifdef ARDUINOJSON_SLOT_OFFSET_SIZE
+#error ARDUINOJSON_SLOT_OFFSET_SIZE has been removed, use ARDUINOJSON_SLOT_ID_SIZE instead
+#endif
+
+#ifdef ARDUINOJSON_ENABLE_STRING_DEDUPLICATION
+#warning "ARDUINOJSON_ENABLE_STRING_DEDUPLICATION has been removed, string deduplication is now always enabled"
+#endif
+
 #ifdef __GNUC__
 
 #define ARDUINOJSON_PRAGMA(x) _Pragma(#x)
@@ -13,7 +23,7 @@
 #define ARDUINOJSON_STRINGIFY(S) #S
 
 #define ARDUINOJSON_DEPRECATION_ERROR(X, Y) \
-  ARDUINOJSON_COMPILE_ERROR(ARDUINOJSON_STRINGIFY(X is a Y from ArduinoJson 5. Please see https:/\/arduinojson.org/upgrade to learn how to upgrade your program to ArduinoJson version 6))
+  ARDUINOJSON_COMPILE_ERROR(ARDUINOJSON_STRINGIFY(X is a Y from ArduinoJson 5. Please see https:/\/arduinojson.org/v7/upgrade-from-v5/ to learn how to upgrade to ArduinoJson 7))
 
 #define StaticJsonBuffer ARDUINOJSON_DEPRECATION_ERROR(StaticJsonBuffer, class)
 #define DynamicJsonBuffer ARDUINOJSON_DEPRECATION_ERROR(DynamicJsonBuffer, class)
@@ -22,4 +32,113 @@
 
 #define ARDUINOJSON_NAMESPACE _Pragma ("GCC warning \"ARDUINOJSON_NAMESPACE is deprecated, use ArduinoJson instead\"") ArduinoJson
 
+// DEPRECATED: you don't need to compute the size anymore
+#define JSON_ARRAY_SIZE(N) _Pragma ("GCC warning \"JSON_ARRAY_SIZE is deprecated, you don't need to compute the size anymore\"") (ArduinoJson::detail::sizeofArray(N))
+
+// DEPRECATED: you don't need to compute the size anymore
+#define JSON_OBJECT_SIZE(N) _Pragma ("GCC warning \"JSON_OBJECT_SIZE is deprecated, you don't need to compute the size anymore\"") (ArduinoJson::detail::sizeofObject(N))
+
+// DEPRECATED: you don't need to compute the size anymore
+#define JSON_STRING_SIZE(N) _Pragma ("GCC warning \"JSON_STRING_SIZE is deprecated, you don't need to compute the size anymore\"") (ArduinoJson::detail::sizeofString(N))
+
+#else
+
+// DEPRECATED: you don't need to compute the size anymore
+#define JSON_ARRAY_SIZE(N) (ArduinoJson::detail::sizeofArray(N))
+
+// DEPRECATED: you don't need to compute the size anymore
+#define JSON_OBJECT_SIZE(N) (ArduinoJson::detail::sizeofObject(N))
+
+// DEPRECATED: you don't need to compute the size anymore
+#define JSON_STRING_SIZE(N) (ArduinoJson::detail::sizeofString(N))
+
 #endif
+
+// clang-format on
+
+ARDUINOJSON_BEGIN_PUBLIC_NAMESPACE
+
+// DEPRECATED: use JsonDocument instead
+template <size_t N>
+class ARDUINOJSON_DEPRECATED("use JsonDocument instead") StaticJsonDocument
+    : public JsonDocument {
+ public:
+  using JsonDocument::JsonDocument;
+
+  size_t capacity() const {
+    return N;
+  }
+};
+
+namespace detail {
+template <typename TAllocator>
+class AllocatorAdapter : public Allocator {
+ public:
+  AllocatorAdapter(const AllocatorAdapter&) = delete;
+  AllocatorAdapter& operator=(const AllocatorAdapter&) = delete;
+
+  void* allocate(size_t size) override {
+    return _allocator.allocate(size);
+  }
+
+  void deallocate(void* ptr) override {
+    _allocator.deallocate(ptr);
+  }
+
+  void* reallocate(void* ptr, size_t new_size) override {
+    return _allocator.reallocate(ptr, new_size);
+  }
+
+  static Allocator* instance() {
+    static AllocatorAdapter instance;
+    return &instance;
+  }
+
+ private:
+  AllocatorAdapter() = default;
+  ~AllocatorAdapter() = default;
+
+  TAllocator _allocator;
+};
+}  // namespace detail
+
+// DEPRECATED: use JsonDocument instead
+template <typename TAllocator>
+class ARDUINOJSON_DEPRECATED("use JsonDocument instead") BasicJsonDocument
+    : public JsonDocument {
+ public:
+  BasicJsonDocument(size_t capacity)
+      : JsonDocument(detail::AllocatorAdapter<TAllocator>::instance()),
+        _capacity(capacity) {}
+
+  size_t capacity() const {
+    return _capacity;
+  }
+
+  void garbageCollect() {}
+
+ private:
+  size_t _capacity;
+};
+
+// DEPRECATED: use JsonDocument instead
+class ARDUINOJSON_DEPRECATED("use JsonDocument instead") DynamicJsonDocument
+    : public JsonDocument {
+ public:
+  DynamicJsonDocument(size_t capacity) : _capacity(capacity) {}
+
+  size_t capacity() const {
+    return _capacity;
+  }
+
+  void garbageCollect() {}
+
+ private:
+  size_t _capacity;
+};
+
+inline JsonObject JsonArray::createNestedObject() const {
+  return add<JsonObject>();
+}
+
+ARDUINOJSON_END_PUBLIC_NAMESPACE
diff --git a/lib/ArduinoJson/src/ArduinoJson/version.hpp b/lib/ArduinoJson/src/ArduinoJson/version.hpp
index 5e6500a46..e41890e9f 100644
--- a/lib/ArduinoJson/src/ArduinoJson/version.hpp
+++ b/lib/ArduinoJson/src/ArduinoJson/version.hpp
@@ -1,11 +1,11 @@
 // ArduinoJson - https://arduinojson.org
-// Copyright © 2014-2023, Benoit BLANCHON
+// Copyright © 2014-2024, Benoit BLANCHON
 // MIT License
 
 #pragma once
 
-#define ARDUINOJSON_VERSION "6.21.3"
-#define ARDUINOJSON_VERSION_MAJOR 6
-#define ARDUINOJSON_VERSION_MINOR 21
-#define ARDUINOJSON_VERSION_REVISION 3
-#define ARDUINOJSON_VERSION_MACRO V6213
+#define ARDUINOJSON_VERSION "7.0.2"
+#define ARDUINOJSON_VERSION_MAJOR 7
+#define ARDUINOJSON_VERSION_MINOR 0
+#define ARDUINOJSON_VERSION_REVISION 2
+#define ARDUINOJSON_VERSION_MACRO V702
diff --git a/lib/ArduinoJson/src/CMakeLists.txt b/lib/ArduinoJson/src/CMakeLists.txt
index 10aef8089..cc782e702 100644
--- a/lib/ArduinoJson/src/CMakeLists.txt
+++ b/lib/ArduinoJson/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 # ArduinoJson - https://arduinojson.org
-# Copyright © 2014-2023, Benoit BLANCHON
+# Copyright © 2014-2024, Benoit BLANCHON
 # MIT License
 
 # I have no idea what this is about, I simply followed the instructions from:
diff --git a/lib/ESPAsyncWebServer/AsyncJson.h b/lib/ESPAsyncWebServer/AsyncJson.h
index 1f7af7356..f005f6ea5 100644
--- a/lib/ESPAsyncWebServer/AsyncJson.h
+++ b/lib/ESPAsyncWebServer/AsyncJson.h
@@ -53,25 +53,24 @@ class ChunkPrint : public Print {
 // added by Proddy
 class MsgpackAsyncJsonResponse : public AsyncAbstractResponse {
   protected:
-    DynamicJsonDocument _jsonBuffer;
-    JsonVariant         _root;
-    bool                _isValid;
+    JsonDocument _jsonBuffer;
+    JsonVariant  _root;
+    bool         _isValid;
 
   public:
-    MsgpackAsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE)
-        : _jsonBuffer(maxJsonBufferSize)
-        , _isValid{false} {
+    MsgpackAsyncJsonResponse(bool isArray = false)
+        : _isValid{false} {
         _code        = 200;
         _contentType = JSON_MIMETYPE;
         if (isArray)
-            _root = _jsonBuffer.createNestedArray();
+            _root = _jsonBuffer.to<JsonArray>();
         else
-            _root = _jsonBuffer.createNestedObject();
+            _root = _jsonBuffer.add<JsonObject>();
     }
 
     ~MsgpackAsyncJsonResponse() {
     }
-    JsonVariant & getRoot() {
+    JsonVariant getRoot() {
         return _root;
     }
     bool _sourceValid() const {
@@ -79,9 +78,6 @@ class MsgpackAsyncJsonResponse : public AsyncAbstractResponse {
     }
     size_t setLength() {
         _contentLength = measureMsgPack(_root);
-        // EMS-ESP
-        //_headers.add(new AsyncWebHeader("Json-Length", String(_jsonBuffer.memoryUsage()))); // For determining size of EMSESP_JSON_SIZE_XXLARGE (Sunbuzz)
-        // Json-Length: 10635
         if (_contentLength) {
             _isValid = true;
         }
@@ -101,26 +97,24 @@ class MsgpackAsyncJsonResponse : public AsyncAbstractResponse {
 
 class AsyncJsonResponse : public AsyncAbstractResponse {
   protected:
-    DynamicJsonDocument _jsonBuffer;
-
-    JsonVariant _root;
-    bool        _isValid;
+    JsonDocument _jsonBuffer;
+    JsonVariant  _root;
+    bool         _isValid;
 
   public:
-    AsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE)
-        : _jsonBuffer(maxJsonBufferSize)
-        , _isValid{false} {
+    AsyncJsonResponse(bool isArray = false)
+        : _isValid{false} {
         _code        = 200;
         _contentType = JSON_MIMETYPE;
         if (isArray)
-            _root = _jsonBuffer.createNestedArray();
+            _root = _jsonBuffer.to<JsonArray>();
         else
-            _root = _jsonBuffer.createNestedObject();
+            _root = _jsonBuffer.add<JsonObject>();
     }
 
     ~AsyncJsonResponse() {
     }
-    JsonVariant & getRoot() {
+    JsonVariant getRoot() {
         return _root;
     }
     bool _sourceValid() const {
@@ -147,8 +141,8 @@ class AsyncJsonResponse : public AsyncAbstractResponse {
 
 class PrettyAsyncJsonResponse : public AsyncJsonResponse {
   public:
-    PrettyAsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE)
-        : AsyncJsonResponse{isArray, maxJsonBufferSize} {
+    PrettyAsyncJsonResponse(bool isArray = false)
+        : AsyncJsonResponse{isArray} {
     }
     size_t setLength() {
         _contentLength = measureJsonPretty(_root);
@@ -164,7 +158,7 @@ class PrettyAsyncJsonResponse : public AsyncJsonResponse {
     }
 };
 
-typedef std::function<void(AsyncWebServerRequest * request, JsonVariant & json)> ArJsonRequestHandlerFunction;
+typedef std::function<void(AsyncWebServerRequest * request, JsonVariant json)> ArJsonRequestHandlerFunction;
 
 class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
   private:
@@ -179,11 +173,10 @@ class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
     size_t _maxContentLength;
 
   public:
-    AsyncCallbackJsonWebHandler(const String & uri, ArJsonRequestHandlerFunction onRequest, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE)
+    AsyncCallbackJsonWebHandler(const String & uri, ArJsonRequestHandlerFunction onRequest)
         : _uri(uri)
         , _method(HTTP_POST | HTTP_PUT | HTTP_PATCH)
         , _onRequest(onRequest)
-        , _maxJsonBufferSize(maxJsonBufferSize)
         , _maxContentLength(16384) {
     }
 
@@ -193,9 +186,9 @@ class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
     void setMaxContentLength(int maxContentLength) {
         _maxContentLength = maxContentLength;
     }
-    void setMaxJsonBufferSize(size_t maxJsonBufferSize) {
-        _maxJsonBufferSize = maxJsonBufferSize;
-    }
+    // void setMaxJsonBufferSize(size_t maxJsonBufferSize) {
+    //     _maxJsonBufferSize = maxJsonBufferSize;
+    // }
     void onRequest(ArJsonRequestHandlerFunction fn) {
         _onRequest = fn;
     }
@@ -220,7 +213,7 @@ class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
     virtual void handleRequest(AsyncWebServerRequest * request) override final {
         if (_onRequest) {
             if (request->_tempObject != NULL) {
-                DynamicJsonDocument  jsonBuffer(this->_maxJsonBufferSize);
+                JsonDocument         jsonBuffer;
                 DeserializationError error = deserializeJson(jsonBuffer, (uint8_t *)(request->_tempObject));
                 if (!error) {
                     JsonVariant json = jsonBuffer.as<JsonVariant>();
diff --git a/lib/framework/APSettingsService.h b/lib/framework/APSettingsService.h
index 68bca2135..c2eacd084 100644
--- a/lib/framework/APSettingsService.h
+++ b/lib/framework/APSettingsService.h
@@ -75,7 +75,7 @@ class APSettings {
                && subnetMask == settings.subnetMask;
     }
 
-    static void read(APSettings & settings, JsonObject & root) {
+    static void read(APSettings & settings, JsonObject root) {
         root["provision_mode"] = settings.provisionMode;
         root["ssid"]           = settings.ssid;
         root["password"]       = settings.password;
@@ -87,7 +87,7 @@ class APSettings {
         root["subnet_mask"]    = settings.subnetMask.toString();
     }
 
-    static StateUpdateResult update(JsonObject & root, APSettings & settings) {
+    static StateUpdateResult update(JsonObject root, APSettings & settings) {
         APSettings newSettings    = {};
         newSettings.provisionMode = root["provision_mode"] | FACTORY_AP_PROVISION_MODE;
         switch (settings.provisionMode) {
diff --git a/lib/framework/APStatus.cpp b/lib/framework/APStatus.cpp
index b60dd3ddd..d4595fefe 100644
--- a/lib/framework/APStatus.cpp
+++ b/lib/framework/APStatus.cpp
@@ -10,7 +10,7 @@ APStatus::APStatus(AsyncWebServer * server, SecurityManager * securityManager, A
 }
 
 void APStatus::apStatus(AsyncWebServerRequest * request) {
-    AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_AP_STATUS_SIZE);
+    AsyncJsonResponse * response = new AsyncJsonResponse(false);
     JsonObject          root     = response->getRoot();
 
     root["status"]      = _apSettingsService->getAPNetworkStatus();
diff --git a/lib/framework/APStatus.h b/lib/framework/APStatus.h
index 754c66618..2b7d35a04 100644
--- a/lib/framework/APStatus.h
+++ b/lib/framework/APStatus.h
@@ -10,7 +10,7 @@
 #include <SecurityManager.h>
 #include <APSettingsService.h>
 
-#define MAX_AP_STATUS_SIZE 1024
+// #define MAX_AP_STATUS_SIZE 1024
 #define AP_STATUS_SERVICE_PATH "/rest/apStatus"
 
 class APStatus {
diff --git a/lib/framework/ArduinoJsonJWT.cpp b/lib/framework/ArduinoJsonJWT.cpp
index adca88f3e..595166ec5 100644
--- a/lib/framework/ArduinoJsonJWT.cpp
+++ b/lib/framework/ArduinoJsonJWT.cpp
@@ -34,7 +34,7 @@ String ArduinoJsonJWT::sign(String & payload) {
     return encode((char *)hmacResult, 32);
 }
 
-String ArduinoJsonJWT::buildJWT(JsonObject & payload) {
+String ArduinoJsonJWT::buildJWT(JsonObject payload) {
     // serialize, then encode payload
     String jwt;
     serializeJson(payload, jwt);
diff --git a/lib/framework/ArduinoJsonJWT.h b/lib/framework/ArduinoJsonJWT.h
index 3a76f71f6..cd13d5fa4 100644
--- a/lib/framework/ArduinoJsonJWT.h
+++ b/lib/framework/ArduinoJsonJWT.h
@@ -25,7 +25,7 @@ class ArduinoJsonJWT {
     void   setSecret(String secret);
     String getSecret();
 
-    String buildJWT(JsonObject & payload);
+    String buildJWT(JsonObject payload);
     void   parseJWT(String jwt, JsonDocument & jsonDocument);
 };
 
diff --git a/lib/framework/AuthenticationService.cpp b/lib/framework/AuthenticationService.cpp
index 0c1822efe..fd316a87c 100644
--- a/lib/framework/AuthenticationService.cpp
+++ b/lib/framework/AuthenticationService.cpp
@@ -25,14 +25,14 @@ void AuthenticationService::verifyAuthorization(AsyncWebServerRequest * request)
  * Signs in a user if the username and password match. Provides a JWT to be used in the Authorization header in
  * subsequent requests.
  */
-void AuthenticationService::signIn(AsyncWebServerRequest * request, JsonVariant & json) {
+void AuthenticationService::signIn(AsyncWebServerRequest * request, JsonVariant json) {
     if (json.is<JsonObject>()) {
         String         username       = json["username"];
         String         password       = json["password"];
         Authentication authentication = _securityManager->authenticate(username, password);
         if (authentication.authenticated) {
             User *              user       = authentication.user;
-            AsyncJsonResponse * response   = new AsyncJsonResponse(false, MAX_AUTHENTICATION_SIZE);
+            AsyncJsonResponse * response   = new AsyncJsonResponse(false);
             JsonObject          jsonObject = response->getRoot();
             jsonObject["access_token"]     = _securityManager->generateJWT(user);
             response->setLength();
diff --git a/lib/framework/AuthenticationService.h b/lib/framework/AuthenticationService.h
index 60ed100b6..d8a823485 100644
--- a/lib/framework/AuthenticationService.h
+++ b/lib/framework/AuthenticationService.h
@@ -21,7 +21,7 @@ class AuthenticationService {
     AsyncCallbackJsonWebHandler _signInHandler;
 
     // endpoint functions
-    void signIn(AsyncWebServerRequest * request, JsonVariant & json);
+    void signIn(AsyncWebServerRequest * request, JsonVariant json);
     void verifyAuthorization(AsyncWebServerRequest * request);
 };
 
diff --git a/lib/framework/ESP8266React.cpp b/lib/framework/ESP8266React.cpp
index ad2331428..d182dafa7 100644
--- a/lib/framework/ESP8266React.cpp
+++ b/lib/framework/ESP8266React.cpp
@@ -25,6 +25,7 @@ ESP8266React::ESP8266React(AsyncWebServer * server, FS * fs)
         ArRequestHandlerFunction requestHandler = [contentType, content, len](AsyncWebServerRequest * request) {
             AsyncWebServerResponse * response = request->beginResponse_P(200, contentType, content, len);
             response->addHeader("Content-Encoding", "gzip");
+            response->addHeader("Cache-Control", "public, immutable, max-age=31536000");
             // response->addHeader("Content-Encoding", "br"); // only works over HTTPS
             request->send(response);
         };
@@ -53,6 +54,7 @@ void ESP8266React::begin() {
             DefaultHeaders::Instance().addHeader("Access-Control-Allow-Headers", "Accept, Content-Type, Authorization");
             DefaultHeaders::Instance().addHeader("Access-Control-Allow-Credentials", "true");
         }
+        DefaultHeaders::Instance().addHeader("Server", networkSettings.hostname);
     });
     _apSettingsService.begin();
     _ntpSettingsService.begin();
diff --git a/lib/framework/FSPersistence.h b/lib/framework/FSPersistence.h
index 434ab78ee..ec38aec37 100644
--- a/lib/framework/FSPersistence.h
+++ b/lib/framework/FSPersistence.h
@@ -7,18 +7,12 @@
 template <class T>
 class FSPersistence {
   public:
-    FSPersistence(JsonStateReader<T>   stateReader,
-                  JsonStateUpdater<T>  stateUpdater,
-                  StatefulService<T> * statefulService,
-                  FS *                 fs,
-                  const char *         filePath,
-                  size_t               bufferSize = FS_BUFFER_SIZE)
+    FSPersistence(JsonStateReader<T> stateReader, JsonStateUpdater<T> stateUpdater, StatefulService<T> * statefulService, FS * fs, const char * filePath)
         : _stateReader(stateReader)
         , _stateUpdater(stateUpdater)
         , _statefulService(statefulService)
         , _fs(fs)
         , _filePath(filePath)
-        , _bufferSize(bufferSize)
         , _updateHandlerId(0) {
         enableUpdateHandler();
     }
@@ -27,8 +21,8 @@ class FSPersistence {
         File settingsFile = _fs->open(_filePath, "r");
 
         if (settingsFile) {
-            DynamicJsonDocument  jsonDocument = DynamicJsonDocument(_bufferSize);
-            DeserializationError error        = deserializeJson(jsonDocument, settingsFile);
+            JsonDocument         jsonDocument;
+            DeserializationError error = deserializeJson(jsonDocument, settingsFile);
             if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
                 JsonObject jsonObject = jsonDocument.as<JsonObject>();
                 _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
@@ -46,8 +40,8 @@ class FSPersistence {
 
     bool writeToFS() {
         // create and populate a new json object
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
-        JsonObject          jsonObject   = jsonDocument.to<JsonObject>();
+        JsonDocument jsonDocument;
+        JsonObject   jsonObject = jsonDocument.to<JsonObject>();
         _statefulService->read(jsonObject, _stateReader);
 
         // make directories if required, for new IDF4.2 & LittleFS
@@ -96,15 +90,14 @@ class FSPersistence {
     StatefulService<T> * _statefulService;
     FS *                 _fs;
     const char *         _filePath;
-    size_t               _bufferSize;
     update_handler_id_t  _updateHandlerId;
 
   protected:
     // We assume the updater supplies sensible defaults if an empty object
     // is supplied, this virtual function allows that to be changed.
     virtual void applyDefaults() {
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
-        JsonObject          jsonObject   = jsonDocument.as<JsonObject>();
+        JsonDocument jsonDocument;
+        JsonObject   jsonObject = jsonDocument.as<JsonObject>();
         _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
     }
 };
diff --git a/lib/framework/FeaturesService.cpp b/lib/framework/FeaturesService.cpp
index f8a82f441..cddb85586 100644
--- a/lib/framework/FeaturesService.cpp
+++ b/lib/framework/FeaturesService.cpp
@@ -8,7 +8,7 @@ FeaturesService::FeaturesService(AsyncWebServer * server) {
 }
 
 void FeaturesService::features(AsyncWebServerRequest * request) {
-    AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_FEATURES_SIZE);
+    AsyncJsonResponse * response = new AsyncJsonResponse(false);
     JsonObject          root     = response->getRoot();
 
     root["version"]  = EMSESP_APP_VERSION;
diff --git a/lib/framework/FeaturesService.h b/lib/framework/FeaturesService.h
index 257d0e1cf..dc64a8b3d 100644
--- a/lib/framework/FeaturesService.h
+++ b/lib/framework/FeaturesService.h
@@ -8,7 +8,7 @@
 #include <AsyncJson.h>
 #include <ESPAsyncWebServer.h>
 
-#define MAX_FEATURES_SIZE 256
+// #define MAX_FEATURES_SIZE 256
 #define FEATURES_SERVICE_PATH "/rest/features"
 
 class FeaturesService {
diff --git a/lib/framework/HttpEndpoint.h b/lib/framework/HttpEndpoint.h
index 926a6f772..3c1902583 100644
--- a/lib/framework/HttpEndpoint.h
+++ b/lib/framework/HttpEndpoint.h
@@ -13,90 +13,48 @@
 using namespace std::placeholders; // for `_1` etc
 
 template <class T>
-class HttpGetEndpoint {
-  public:
-    HttpGetEndpoint(JsonStateReader<T>      stateReader,
-                    StatefulService<T> *    statefulService,
-                    AsyncWebServer *        server,
-                    const String &          servicePath,
-                    SecurityManager *       securityManager,
-                    AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                    size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
-        : _stateReader(stateReader)
-        , _statefulService(statefulService)
-        , _bufferSize(bufferSize) {
-        server->on(servicePath.c_str(), HTTP_GET, securityManager->wrapRequest(std::bind(&HttpGetEndpoint::fetchSettings, this, _1), authenticationPredicate));
-    }
-
-    HttpGetEndpoint(JsonStateReader<T>   stateReader,
-                    StatefulService<T> * statefulService,
-                    AsyncWebServer *     server,
-                    const String &       servicePath,
-                    size_t               bufferSize = DEFAULT_BUFFER_SIZE)
-        : _stateReader(stateReader)
-        , _statefulService(statefulService)
-        , _bufferSize(bufferSize) {
-        server->on(servicePath.c_str(), HTTP_GET, std::bind(&HttpGetEndpoint::fetchSettings, this, _1));
-    }
-
+class HttpEndpoint {
   protected:
     JsonStateReader<T>   _stateReader;
+    JsonStateUpdater<T>  _stateUpdater;
     StatefulService<T> * _statefulService;
-    size_t               _bufferSize;
 
-    void fetchSettings(AsyncWebServerRequest * request) {
-        AsyncJsonResponse * response   = new AsyncJsonResponse(false, _bufferSize);
-        JsonObject          jsonObject = response->getRoot().to<JsonObject>();
-        _statefulService->read(jsonObject, _stateReader);
+    AsyncCallbackWebHandler *     GEThandler;
+    AsyncCallbackJsonWebHandler * POSThandler;
 
-        response->setLength();
-        request->send(response);
-    }
-};
-
-template <class T>
-class HttpPostEndpoint {
   public:
-    HttpPostEndpoint(JsonStateReader<T>      stateReader,
-                     JsonStateUpdater<T>     stateUpdater,
-                     StatefulService<T> *    statefulService,
-                     AsyncWebServer *        server,
-                     const String &          servicePath,
-                     SecurityManager *       securityManager,
-                     AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                     size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
+    HttpEndpoint(JsonStateReader<T>      stateReader,
+                 JsonStateUpdater<T>     stateUpdater,
+                 StatefulService<T> *    statefulService,
+                 AsyncWebServer *        server,
+                 const String &          servicePath,
+                 SecurityManager *       securityManager,
+                 AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN)
         : _stateReader(stateReader)
         , _stateUpdater(stateUpdater)
-        , _statefulService(statefulService)
-        , _updateHandler(servicePath, securityManager->wrapCallback(std::bind(&HttpPostEndpoint::updateSettings, this, _1, _2), authenticationPredicate), bufferSize)
-        , _bufferSize(bufferSize) {
-        _updateHandler.setMethod(HTTP_POST);
-        server->addHandler(&_updateHandler);
-    }
+        , _statefulService(statefulService) {
+        // Create the GET and POST endpoints
+        // We can't use HTTP_ANY and process one a single endpoint due to the way the ESPAsyncWebServer library works
+        // Could also use server->on() but this is more efficient
 
-    HttpPostEndpoint(JsonStateReader<T>   stateReader,
-                     JsonStateUpdater<T>  stateUpdater,
-                     StatefulService<T> * statefulService,
-                     AsyncWebServer *     server,
-                     const String &       servicePath,
-                     size_t               bufferSize = DEFAULT_BUFFER_SIZE)
-        : _stateReader(stateReader)
-        , _stateUpdater(stateUpdater)
-        , _statefulService(statefulService)
-        , _updateHandler(servicePath, std::bind(&HttpPostEndpoint::updateSettings, this, _1, _2), bufferSize)
-        , _bufferSize(bufferSize) {
-        _updateHandler.setMethod(HTTP_POST);
-        server->addHandler(&_updateHandler);
+        // create the GET
+        GEThandler = new AsyncCallbackWebHandler();
+        GEThandler->setUri(servicePath);
+        GEThandler->setMethod(HTTP_GET);
+        GEThandler->onRequest(securityManager->wrapRequest(std::bind(&HttpEndpoint::fetchSettings, this, _1), authenticationPredicate));
+        server->addHandler(GEThandler);
+
+        // create the POST
+        POSThandler =
+            new AsyncCallbackJsonWebHandler(servicePath,
+                                            securityManager->wrapCallback(std::bind(&HttpEndpoint::updateSettings, this, _1, _2), authenticationPredicate));
+        POSThandler->setMethod(HTTP_POST);
+        server->addHandler(POSThandler);
     }
 
   protected:
-    JsonStateReader<T>          _stateReader;
-    JsonStateUpdater<T>         _stateUpdater;
-    StatefulService<T> *        _statefulService;
-    AsyncCallbackJsonWebHandler _updateHandler;
-    size_t                      _bufferSize;
-
-    void updateSettings(AsyncWebServerRequest * request, JsonVariant & json) {
+    // for POST
+    void updateSettings(AsyncWebServerRequest * request, JsonVariant json) {
         if (!json.is<JsonObject>()) {
             request->send(400);
             return;
@@ -109,7 +67,7 @@ class HttpPostEndpoint {
         } else if ((outcome == StateUpdateResult::CHANGED) || (outcome == StateUpdateResult::CHANGED_RESTART)) {
             request->onDisconnect([this]() { _statefulService->callUpdateHandlers(HTTP_ENDPOINT_ORIGIN_ID); });
         }
-        AsyncJsonResponse * response = new AsyncJsonResponse(false, _bufferSize);
+        AsyncJsonResponse * response = new AsyncJsonResponse(false);
         jsonObject                   = response->getRoot().to<JsonObject>();
         _statefulService->read(jsonObject, _stateReader);
         if (outcome == StateUpdateResult::CHANGED_RESTART) {
@@ -118,31 +76,15 @@ class HttpPostEndpoint {
         response->setLength();
         request->send(response);
     }
-};
 
-template <class T>
-class HttpEndpoint : public HttpGetEndpoint<T>, public HttpPostEndpoint<T> {
-  public:
-    HttpEndpoint(JsonStateReader<T>      stateReader,
-                 JsonStateUpdater<T>     stateUpdater,
-                 StatefulService<T> *    statefulService,
-                 AsyncWebServer *        server,
-                 const String &          servicePath,
-                 SecurityManager *       securityManager,
-                 AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                 size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
-        : HttpGetEndpoint<T>(stateReader, statefulService, server, servicePath, securityManager, authenticationPredicate, bufferSize)
-        , HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath, securityManager, authenticationPredicate, bufferSize) {
-    }
+    // for GET
+    void fetchSettings(AsyncWebServerRequest * request) {
+        AsyncJsonResponse * response   = new AsyncJsonResponse(false);
+        JsonObject          jsonObject = response->getRoot().to<JsonObject>();
+        _statefulService->read(jsonObject, _stateReader);
 
-    HttpEndpoint(JsonStateReader<T>   stateReader,
-                 JsonStateUpdater<T>  stateUpdater,
-                 StatefulService<T> * statefulService,
-                 AsyncWebServer *     server,
-                 const String &       servicePath,
-                 size_t               bufferSize = DEFAULT_BUFFER_SIZE)
-        : HttpGetEndpoint<T>(stateReader, statefulService, server, servicePath, bufferSize)
-        , HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath, bufferSize) {
+        response->setLength();
+        request->send(response);
     }
 };
 
diff --git a/lib/framework/JsonUtils.h b/lib/framework/JsonUtils.h
index 3fa38cb12..29a72bd6a 100644
--- a/lib/framework/JsonUtils.h
+++ b/lib/framework/JsonUtils.h
@@ -8,19 +8,19 @@
 
 class JsonUtils {
   public:
-    static void readIP(JsonObject & root, const String & key, IPAddress & ip, const String & def) {
+    static void readIP(JsonObject root, const String & key, IPAddress & ip, const String & def) {
         IPAddress defaultIp = {};
         if (!defaultIp.fromString(def)) {
             defaultIp = INADDR_NONE;
         }
         readIP(root, key, ip, defaultIp);
     }
-    static void readIP(JsonObject & root, const String & key, IPAddress & ip, const IPAddress & defaultIp = INADDR_NONE) {
+    static void readIP(JsonObject root, const String & key, IPAddress & ip, const IPAddress & defaultIp = INADDR_NONE) {
         if (!root[key].is<String>() || !ip.fromString(root[key].as<String>())) {
             ip = defaultIp;
         }
     }
-    static void writeIP(JsonObject & root, const String & key, const IPAddress & ip) {
+    static void writeIP(JsonObject root, const String & key, const IPAddress & ip) {
         if (IPUtils::isSet(ip)) {
             root[key] = ip.toString();
         }
diff --git a/lib/framework/MqttSettingsService.cpp b/lib/framework/MqttSettingsService.cpp
index e438b3349..1517414cc 100644
--- a/lib/framework/MqttSettingsService.cpp
+++ b/lib/framework/MqttSettingsService.cpp
@@ -216,7 +216,7 @@ bool MqttSettingsService::configureMqtt() {
     return false;
 }
 
-void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
+void MqttSettings::read(MqttSettings & settings, JsonObject root) {
 #if CONFIG_IDF_TARGET_ESP32S3
 #ifndef TASMOTA_SDK
     root["enableTLS"] = settings.enableTLS;
@@ -253,7 +253,7 @@ void MqttSettings::read(MqttSettings & settings, JsonObject & root) {
     root["send_response"]           = settings.send_response;
 }
 
-StateUpdateResult MqttSettings::update(JsonObject & root, MqttSettings & settings) {
+StateUpdateResult MqttSettings::update(JsonObject root, MqttSettings & settings) {
     MqttSettings newSettings = {};
     bool         changed     = false;
 
diff --git a/lib/framework/MqttSettingsService.h b/lib/framework/MqttSettingsService.h
index 4db425c4f..2acb840cf 100644
--- a/lib/framework/MqttSettingsService.h
+++ b/lib/framework/MqttSettingsService.h
@@ -98,8 +98,8 @@ class MqttSettings {
     bool     send_response;
     uint8_t  entity_format;
 
-    static void              read(MqttSettings & settings, JsonObject & root);
-    static StateUpdateResult update(JsonObject & root, MqttSettings & settings);
+    static void              read(MqttSettings & settings, JsonObject root);
+    static StateUpdateResult update(JsonObject root, MqttSettings & settings);
 };
 
 class MqttSettingsService : public StatefulService<MqttSettings> {
diff --git a/lib/framework/MqttStatus.cpp b/lib/framework/MqttStatus.cpp
index 2a12ac16f..c62ba99e1 100644
--- a/lib/framework/MqttStatus.cpp
+++ b/lib/framework/MqttStatus.cpp
@@ -12,7 +12,7 @@ MqttStatus::MqttStatus(AsyncWebServer * server, MqttSettingsService * mqttSettin
 }
 
 void MqttStatus::mqttStatus(AsyncWebServerRequest * request) {
-    AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_MQTT_STATUS_SIZE);
+    AsyncJsonResponse * response = new AsyncJsonResponse(false);
     JsonObject          root     = response->getRoot();
 
     root["enabled"]           = _mqttSettingsService->isEnabled();
diff --git a/lib/framework/MqttStatus.h b/lib/framework/MqttStatus.h
index cb4b2172a..f8260bd54 100644
--- a/lib/framework/MqttStatus.h
+++ b/lib/framework/MqttStatus.h
@@ -7,7 +7,7 @@
 #include <ESPAsyncWebServer.h>
 #include <SecurityManager.h>
 
-#define MAX_MQTT_STATUS_SIZE 1024
+// #define MAX_MQTT_STATUS_SIZE 1024
 #define MQTT_STATUS_SERVICE_PATH "/rest/mqttStatus"
 
 class MqttStatus {
diff --git a/lib/framework/NTPSettingsService.cpp b/lib/framework/NTPSettingsService.cpp
index 751de6751..e1a4aa1c5 100644
--- a/lib/framework/NTPSettingsService.cpp
+++ b/lib/framework/NTPSettingsService.cpp
@@ -61,7 +61,7 @@ void NTPSettingsService::configureNTP() {
     }
 }
 
-void NTPSettingsService::configureTime(AsyncWebServerRequest * request, JsonVariant & json) {
+void NTPSettingsService::configureTime(AsyncWebServerRequest * request, JsonVariant json) {
     if (json.is<JsonObject>()) {
         struct tm tm        = {0};
         String    timeLocal = json["local_time"];
diff --git a/lib/framework/NTPSettingsService.h b/lib/framework/NTPSettingsService.h
index f26273ecf..e18800fa1 100644
--- a/lib/framework/NTPSettingsService.h
+++ b/lib/framework/NTPSettingsService.h
@@ -36,14 +36,14 @@ class NTPSettings {
     String tzFormat;
     String server;
 
-    static void read(NTPSettings & settings, JsonObject & root) {
+    static void read(NTPSettings & settings, JsonObject root) {
         root["enabled"]   = settings.enabled;
         root["server"]    = settings.server;
         root["tz_label"]  = settings.tzLabel;
         root["tz_format"] = settings.tzFormat;
     }
 
-    static StateUpdateResult update(JsonObject & root, NTPSettings & settings) {
+    static StateUpdateResult update(JsonObject root, NTPSettings & settings) {
         settings.enabled  = root["enabled"] | FACTORY_NTP_ENABLED;
         settings.server   = root["server"] | FACTORY_NTP_SERVER;
         settings.tzLabel  = root["tz_label"] | FACTORY_NTP_TIME_ZONE_LABEL;
@@ -67,7 +67,7 @@ class NTPSettingsService : public StatefulService<NTPSettings> {
     bool connected_ = false;
     void WiFiEvent(WiFiEvent_t event);
     void configureNTP();
-    void configureTime(AsyncWebServerRequest * request, JsonVariant & json);
+    void configureTime(AsyncWebServerRequest * request, JsonVariant json);
 };
 
 #endif
diff --git a/lib/framework/NTPStatus.cpp b/lib/framework/NTPStatus.cpp
index efe18c53f..ddb6bbc2d 100644
--- a/lib/framework/NTPStatus.cpp
+++ b/lib/framework/NTPStatus.cpp
@@ -29,7 +29,7 @@ String toLocalTimeString(tm * time) {
 }
 
 void NTPStatus::ntpStatus(AsyncWebServerRequest * request) {
-    AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_NTP_STATUS_SIZE);
+    AsyncJsonResponse * response = new AsyncJsonResponse(false);
     JsonObject          root     = response->getRoot();
 
     // grab the current instant in unix seconds
diff --git a/lib/framework/NTPStatus.h b/lib/framework/NTPStatus.h
index 0ebe80495..152933fe3 100644
--- a/lib/framework/NTPStatus.h
+++ b/lib/framework/NTPStatus.h
@@ -11,7 +11,7 @@
 #include <SecurityManager.h>
 #include <uuid/common.h>
 
-#define MAX_NTP_STATUS_SIZE 1024
+// #define MAX_NTP_STATUS_SIZE 1024
 #define NTP_STATUS_SERVICE_PATH "/rest/ntpStatus"
 
 class NTPStatus {
diff --git a/lib/framework/NetworkSettingsService.h b/lib/framework/NetworkSettingsService.h
index 901345ea9..96a9b116c 100644
--- a/lib/framework/NetworkSettingsService.h
+++ b/lib/framework/NetworkSettingsService.h
@@ -50,7 +50,7 @@ class NetworkSettings {
     IPAddress dnsIP1;
     IPAddress dnsIP2;
 
-    static void read(NetworkSettings & settings, JsonObject & root) {
+    static void read(NetworkSettings & settings, JsonObject root) {
         // connection settings
         root["ssid"]             = settings.ssid;
         root["bssid"]            = settings.bssid;
@@ -73,7 +73,7 @@ class NetworkSettings {
         JsonUtils::writeIP(root, "dns_ip_2", settings.dnsIP2);
     }
 
-    static StateUpdateResult update(JsonObject & root, NetworkSettings & settings) {
+    static StateUpdateResult update(JsonObject root, NetworkSettings & settings) {
         auto enableCORS         = settings.enableCORS;
         auto CORSOrigin         = settings.CORSOrigin;
         auto ssid               = settings.ssid;
diff --git a/lib/framework/NetworkStatus.cpp b/lib/framework/NetworkStatus.cpp
index 6aea4580f..64e0cd604 100644
--- a/lib/framework/NetworkStatus.cpp
+++ b/lib/framework/NetworkStatus.cpp
@@ -11,7 +11,7 @@ NetworkStatus::NetworkStatus(AsyncWebServer * server, SecurityManager * security
 }
 
 void NetworkStatus::networkStatus(AsyncWebServerRequest * request) {
-    AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_NETWORK_STATUS_SIZE);
+    AsyncJsonResponse * response = new AsyncJsonResponse(false);
     JsonObject          root     = response->getRoot();
 
     bool        ethernet_connected = emsesp::EMSESP::system_.ethernet_connected();
@@ -19,9 +19,11 @@ void NetworkStatus::networkStatus(AsyncWebServerRequest * request) {
 
     // see if Ethernet is connected
     if (ethernet_connected) {
-        root["status"] = 10; // custom code #10 - ETHERNET_STATUS_CONNECTED
+        root["status"]   = 10; // custom code #10 - ETHERNET_STATUS_CONNECTED
+        root["hostname"] = ETH.getHostname();
     } else {
-        root["status"] = (uint8_t)wifi_status;
+        root["status"]   = (uint8_t)wifi_status;
+        root["hostname"] = WiFi.getHostname();
     }
 
     // for both connections show ethernet
diff --git a/lib/framework/OTASettingsService.h b/lib/framework/OTASettingsService.h
index 2594f98db..12818c07e 100644
--- a/lib/framework/OTASettingsService.h
+++ b/lib/framework/OTASettingsService.h
@@ -28,13 +28,13 @@ class OTASettings {
     int    port;
     String password;
 
-    static void read(OTASettings & settings, JsonObject & root) {
+    static void read(OTASettings & settings, JsonObject root) {
         root["enabled"]  = settings.enabled;
         root["port"]     = settings.port;
         root["password"] = settings.password;
     }
 
-    static StateUpdateResult update(JsonObject & root, OTASettings & settings) {
+    static StateUpdateResult update(JsonObject root, OTASettings & settings) {
         settings.enabled  = root["enabled"] | FACTORY_OTA_ENABLED;
         settings.port     = root["port"] | FACTORY_OTA_PORT;
         settings.password = root["password"] | FACTORY_OTA_PASSWORD;
diff --git a/lib/framework/SecurityManager.h b/lib/framework/SecurityManager.h
index 4d364253c..6bc1257ac 100644
--- a/lib/framework/SecurityManager.h
+++ b/lib/framework/SecurityManager.h
@@ -18,7 +18,7 @@
 #define AUTHORIZATION_HEADER_PREFIX "Bearer "
 #define AUTHORIZATION_HEADER_PREFIX_LEN 7
 
-#define MAX_JWT_SIZE 128
+// #define MAX_JWT_SIZE 128
 
 class User {
   public:
diff --git a/lib/framework/SecuritySettingsService.cpp b/lib/framework/SecuritySettingsService.cpp
index 5427a2fa8..9b5ab85c6 100644
--- a/lib/framework/SecuritySettingsService.cpp
+++ b/lib/framework/SecuritySettingsService.cpp
@@ -40,7 +40,7 @@ void SecuritySettingsService::configureJWTHandler() {
 }
 
 Authentication SecuritySettingsService::authenticateJWT(String & jwt) {
-    DynamicJsonDocument payloadDocument(MAX_JWT_SIZE);
+    JsonDocument payloadDocument;
     _jwtHandler.parseJWT(jwt, payloadDocument);
     if (payloadDocument.is<JsonObject>()) {
         JsonObject parsedPayload = payloadDocument.as<JsonObject>();
@@ -63,21 +63,21 @@ Authentication SecuritySettingsService::authenticate(const String & username, co
     return Authentication();
 }
 
-inline void populateJWTPayload(JsonObject & payload, User * user) {
+inline void populateJWTPayload(JsonObject payload, User * user) {
     payload["username"] = user->username;
     payload["admin"]    = user->admin;
 }
 
-boolean SecuritySettingsService::validatePayload(JsonObject & parsedPayload, User * user) {
-    DynamicJsonDocument jsonDocument(MAX_JWT_SIZE);
-    JsonObject          payload = jsonDocument.to<JsonObject>();
+boolean SecuritySettingsService::validatePayload(JsonObject parsedPayload, User * user) {
+    JsonDocument jsonDocument;
+    JsonObject   payload = jsonDocument.to<JsonObject>();
     populateJWTPayload(payload, user);
     return payload == parsedPayload;
 }
 
 String SecuritySettingsService::generateJWT(User * user) {
-    DynamicJsonDocument jsonDocument(MAX_JWT_SIZE);
-    JsonObject          payload = jsonDocument.to<JsonObject>();
+    JsonDocument jsonDocument;
+    JsonObject   payload = jsonDocument.to<JsonObject>();
     populateJWTPayload(payload, user);
     return _jwtHandler.buildJWT(payload);
 }
@@ -101,7 +101,7 @@ ArRequestHandlerFunction SecuritySettingsService::wrapRequest(ArRequestHandlerFu
 }
 
 ArJsonRequestHandlerFunction SecuritySettingsService::wrapCallback(ArJsonRequestHandlerFunction onRequest, AuthenticationPredicate predicate) {
-    return [this, onRequest, predicate](AsyncWebServerRequest * request, JsonVariant & json) {
+    return [this, onRequest, predicate](AsyncWebServerRequest * request, JsonVariant json) {
         Authentication authentication = authenticateRequest(request);
         if (!predicate(authentication)) {
             request->send(401);
@@ -115,7 +115,7 @@ void SecuritySettingsService::generateToken(AsyncWebServerRequest * request) {
     AsyncWebParameter * usernameParam = request->getParam("username");
     for (User _user : _state.users) {
         if (_user.username == usernameParam->value()) {
-            AsyncJsonResponse * response = new AsyncJsonResponse(false, GENERATE_TOKEN_SIZE);
+            AsyncJsonResponse * response = new AsyncJsonResponse(false);
             JsonObject          root     = response->getRoot();
             root["token"]                = generateJWT(&_user);
             response->setLength();
diff --git a/lib/framework/SecuritySettingsService.h b/lib/framework/SecuritySettingsService.h
index cdbd8d085..7010ae99c 100644
--- a/lib/framework/SecuritySettingsService.h
+++ b/lib/framework/SecuritySettingsService.h
@@ -35,21 +35,21 @@ class SecuritySettings {
     String          jwtSecret;
     std::list<User> users;
 
-    static void read(SecuritySettings & settings, JsonObject & root) {
+    static void read(SecuritySettings & settings, JsonObject root) {
         // secret
         root["jwt_secret"] = settings.jwtSecret;
 
         // users
-        JsonArray users = root.createNestedArray("users");
+        JsonArray users = root["users"].to<JsonArray>();
         for (User user : settings.users) {
-            JsonObject userRoot  = users.createNestedObject();
+            JsonObject userRoot  = users.add<JsonObject>();
             userRoot["username"] = user.username;
             userRoot["password"] = user.password;
             userRoot["admin"]    = user.admin;
         }
     }
 
-    static StateUpdateResult update(JsonObject & root, SecuritySettings & settings) {
+    static StateUpdateResult update(JsonObject root, SecuritySettings & settings) {
         // secret
         settings.jwtSecret = root["jwt_secret"] | FACTORY_JWT_SECRET;
 
@@ -98,7 +98,7 @@ class SecuritySettingsService : public StatefulService<SecuritySettings>, public
     /*
    * Verify the payload is correct
    */
-    boolean validatePayload(JsonObject & parsedPayload, User * user);
+    boolean validatePayload(JsonObject parsedPayload, User * user);
 };
 
 #else
diff --git a/lib/framework/StatefulService.h b/lib/framework/StatefulService.h
index 7ee72e0a0..f6510cf25 100644
--- a/lib/framework/StatefulService.h
+++ b/lib/framework/StatefulService.h
@@ -9,14 +9,6 @@
 #include <freertos/FreeRTOS.h>
 #include <freertos/semphr.h>
 
-#ifndef DEFAULT_BUFFER_SIZE
-#define DEFAULT_BUFFER_SIZE 2048
-#endif
-
-#ifndef FS_BUFFER_SIZE
-#define FS_BUFFER_SIZE 8192
-#endif
-
 enum class StateUpdateResult {
     CHANGED = 0,     // The update changed the state and propagation should take place if required
     CHANGED_RESTART, // a restart of the device is needed
@@ -25,10 +17,10 @@ enum class StateUpdateResult {
 };
 
 template <typename T>
-using JsonStateUpdater = std::function<StateUpdateResult(JsonObject & root, T & settings)>;
+using JsonStateUpdater = std::function<StateUpdateResult(JsonObject root, T & settings)>;
 
 template <typename T>
-using JsonStateReader = std::function<void(T & settings, JsonObject & root)>;
+using JsonStateReader = std::function<void(T & settings, JsonObject root)>;
 
 typedef size_t                                       update_handler_id_t;
 typedef std::function<void(const String & originId)> StateUpdateCallback;
@@ -89,7 +81,7 @@ class StatefulService {
         return result;
     }
 
-    StateUpdateResult update(JsonObject & jsonObject, JsonStateUpdater<T> stateUpdater, const String & originId) {
+    StateUpdateResult update(JsonObject jsonObject, JsonStateUpdater<T> stateUpdater, const String & originId) {
         beginTransaction();
         StateUpdateResult result = stateUpdater(jsonObject, _state);
         endTransaction();
@@ -99,7 +91,7 @@ class StatefulService {
         return result;
     }
 
-    StateUpdateResult updateWithoutPropagation(JsonObject & jsonObject, JsonStateUpdater<T> stateUpdater) {
+    StateUpdateResult updateWithoutPropagation(JsonObject jsonObject, JsonStateUpdater<T> stateUpdater) {
         beginTransaction();
         StateUpdateResult result = stateUpdater(jsonObject, _state);
         endTransaction();
@@ -112,7 +104,7 @@ class StatefulService {
         endTransaction();
     }
 
-    void read(JsonObject & jsonObject, JsonStateReader<T> stateReader) {
+    void read(JsonObject jsonObject, JsonStateReader<T> stateReader) {
         beginTransaction();
         stateReader(_state, jsonObject);
         endTransaction();
diff --git a/lib/framework/SystemStatus.cpp b/lib/framework/SystemStatus.cpp
index c03b23312..845583763 100644
--- a/lib/framework/SystemStatus.cpp
+++ b/lib/framework/SystemStatus.cpp
@@ -14,7 +14,7 @@ SystemStatus::SystemStatus(AsyncWebServer * server, SecurityManager * securityMa
 void SystemStatus::systemStatus(AsyncWebServerRequest * request) {
     emsesp::EMSESP::system_.refreshHeapMem(); // refresh free heap and max alloc heap
 
-    AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_ESP_STATUS_SIZE);
+    AsyncJsonResponse * response = new AsyncJsonResponse(false);
     JsonObject          root     = response->getRoot();
 
     root["emsesp_version"]   = EMSESP_APP_VERSION;
diff --git a/lib/framework/SystemStatus.h b/lib/framework/SystemStatus.h
index 73226dfe0..3f5c456be 100644
--- a/lib/framework/SystemStatus.h
+++ b/lib/framework/SystemStatus.h
@@ -10,7 +10,7 @@
 #include <ESPAsyncWebServer.h>
 #include <SecurityManager.h>
 
-#define MAX_ESP_STATUS_SIZE 1024
+// #define MAX_ESP_STATUS_SIZE 1024
 #define SYSTEM_STATUS_SERVICE_PATH "/rest/systemStatus"
 
 class SystemStatus {
diff --git a/lib/framework/UploadFileService.cpp b/lib/framework/UploadFileService.cpp
index 0d7b652d5..58bedf83f 100644
--- a/lib/framework/UploadFileService.cpp
+++ b/lib/framework/UploadFileService.cpp
@@ -52,7 +52,7 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
 
         if (is_firmware) {
             // Check firmware header, 0xE9 magic offset 0 indicates esp bin, chip offset 12: esp32:0, S2:2, C3:5
-#if CONFIG_IDF_TARGET_ESP32                // ESP32/PICO-D4
+#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
             if (len > 12 && (data[0] != 0xE9 || data[12] != 0)) {
                 handleError(request, 503); // service unavailable
                 return;
@@ -81,7 +81,7 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
                 }
                 request->onDisconnect(UploadFileService::handleEarlyDisconnect); // success, let's make sure we end the update if the client hangs up
             } else {
-                handleError(request, 507);                                       // failed to begin, send an error response Insufficient Storage
+                handleError(request, 507); // failed to begin, send an error response Insufficient Storage
                 return;
             }
         } else {
@@ -133,7 +133,7 @@ void UploadFileService::uploadComplete(AsyncWebServerRequest * request) {
     }
 
     if (strlen(md5) == 32) {
-        auto *     response = new AsyncJsonResponse(false, 256);
+        auto *     response = new AsyncJsonResponse(false);
         JsonObject root     = response->getRoot();
         root["md5"]         = md5;
         response->setLength();
diff --git a/lib/framework/WebSocketTxRx.h b/lib/framework/WebSocketTxRx.h
deleted file mode 100644
index 86f5fd22a..000000000
--- a/lib/framework/WebSocketTxRx.h
+++ /dev/null
@@ -1,216 +0,0 @@
-#ifndef WebSocketTxRx_h
-#define WebSocketTxRx_h
-
-#include <StatefulService.h>
-#include <ESPAsyncWebServer.h>
-#include <SecurityManager.h>
-
-#define WEB_SOCKET_CLIENT_ID_MSG_SIZE 128
-
-#define WEB_SOCKET_ORIGIN "websocket"
-#define WEB_SOCKET_ORIGIN_CLIENT_ID_PREFIX "websocket:"
-
-using namespace std::placeholders; // for `_1` etc
-
-template <class T>
-class WebSocketConnector {
-  protected:
-    StatefulService<T> * _statefulService;
-    AsyncWebServer *     _server;
-    AsyncWebSocket       _webSocket;
-    size_t               _bufferSize;
-
-    WebSocketConnector(StatefulService<T> *    statefulService,
-                       AsyncWebServer *        server,
-                       const char *            webSocketPath,
-                       SecurityManager *       securityManager,
-                       AuthenticationPredicate authenticationPredicate,
-                       size_t                  bufferSize)
-        : _statefulService(statefulService)
-        , _server(server)
-        , _webSocket(webSocketPath)
-        , _bufferSize(bufferSize) {
-        _webSocket.setFilter(securityManager->filterRequest(authenticationPredicate));
-        _webSocket.onEvent(std::bind(&WebSocketConnector::onWSEvent, this, _1, _2, _3, _4, _5, _6));
-        _server->addHandler(&_webSocket);
-        _server->on(webSocketPath, HTTP_GET, std::bind(&WebSocketConnector::forbidden, this, _1));
-    }
-
-    WebSocketConnector(StatefulService<T> * statefulService, AsyncWebServer * server, const char * webSocketPath, size_t bufferSize)
-        : _statefulService(statefulService)
-        , _server(server)
-        , _webSocket(webSocketPath)
-        , _bufferSize(bufferSize) {
-        _webSocket.onEvent(std::bind(&WebSocketConnector::onWSEvent, this, _1, _2, _3, _4, _5, _6));
-        _server->addHandler(&_webSocket);
-    }
-
-    virtual void onWSEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t * data, size_t len) = 0;
-
-    String clientId(AsyncWebSocketClient * client) {
-        return WEB_SOCKET_ORIGIN_CLIENT_ID_PREFIX + String(client->id());
-    }
-
-  private:
-    void forbidden(AsyncWebServerRequest * request) {
-        request->send(403);
-    }
-};
-
-template <class T>
-class WebSocketTx : virtual public WebSocketConnector<T> {
-  public:
-    WebSocketTx(JsonStateReader<T>      stateReader,
-                StatefulService<T> *    statefulService,
-                AsyncWebServer *        server,
-                const char *            webSocketPath,
-                SecurityManager *       securityManager,
-                AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
-        : WebSocketConnector<T>(statefulService, server, webSocketPath, securityManager, authenticationPredicate, bufferSize)
-        , _stateReader(stateReader) {
-        WebSocketConnector<T>::_statefulService->addUpdateHandler([&](const String & originId) { transmitData(nullptr, originId); }, false);
-    }
-
-    WebSocketTx(JsonStateReader<T>   stateReader,
-                StatefulService<T> * statefulService,
-                AsyncWebServer *     server,
-                const char *         webSocketPath,
-                size_t               bufferSize = DEFAULT_BUFFER_SIZE)
-        : WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize)
-        , _stateReader(stateReader) {
-        WebSocketConnector<T>::_statefulService->addUpdateHandler([&](const String & originId) { transmitData(nullptr, originId); }, false);
-    }
-
-  protected:
-    virtual void onWSEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t * data, size_t len) {
-        if (type == WS_EVT_CONNECT) {
-            // when a client connects, we transmit it's id and the current payload
-            transmitId(client);
-            transmitData(client, WEB_SOCKET_ORIGIN);
-        }
-    }
-
-  private:
-    JsonStateReader<T> _stateReader;
-
-    void transmitId(AsyncWebSocketClient * client) {
-        DynamicJsonDocument jsonDocument     = DynamicJsonDocument(WEB_SOCKET_CLIENT_ID_MSG_SIZE);
-        JsonObject          root             = jsonDocument.to<JsonObject>();
-        root["type"]                         = "id";
-        root["id"]                           = WebSocketConnector<T>::clientId(client);
-        size_t                        len    = measureJson(jsonDocument);
-        AsyncWebSocketMessageBuffer * buffer = WebSocketConnector<T>::_webSocket.makeBuffer(len);
-        if (buffer) {
-            serializeJson(jsonDocument, (char *)buffer->get(), len + 1);
-            client->text(buffer);
-        }
-    }
-
-    /**
-   * Broadcasts the payload to the destination, if provided. Otherwise broadcasts to all clients except the origin, if
-   * specified.
-   *
-   * Original implementation sent clients their own IDs so they could ignore updates they initiated. This approach
-   * simplifies the client and the server implementation but may not be sufficent for all use-cases.
-   */
-    void transmitData(AsyncWebSocketClient * client, const String & originId) {
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(WebSocketConnector<T>::_bufferSize);
-        JsonObject          root         = jsonDocument.to<JsonObject>();
-        root["type"]                     = "payload";
-        root["origin_id"]                = originId;
-        JsonObject payload               = root.createNestedObject("payload");
-        WebSocketConnector<T>::_statefulService->read(payload, _stateReader);
-
-        size_t                        len    = measureJson(jsonDocument);
-        AsyncWebSocketMessageBuffer * buffer = WebSocketConnector<T>::_webSocket.makeBuffer(len);
-        if (buffer) {
-            serializeJson(jsonDocument, (char *)buffer->get(), len + 1);
-            if (client) {
-                client->text(buffer);
-            } else {
-                WebSocketConnector<T>::_webSocket.textAll(buffer);
-            }
-        }
-    }
-};
-
-template <class T>
-class WebSocketRx : virtual public WebSocketConnector<T> {
-  public:
-    WebSocketRx(JsonStateUpdater<T>     stateUpdater,
-                StatefulService<T> *    statefulService,
-                AsyncWebServer *        server,
-                const char *            webSocketPath,
-                SecurityManager *       securityManager,
-                AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
-        : WebSocketConnector<T>(statefulService, server, webSocketPath, securityManager, authenticationPredicate, bufferSize)
-        , _stateUpdater(stateUpdater) {
-    }
-
-    WebSocketRx(JsonStateUpdater<T>  stateUpdater,
-                StatefulService<T> * statefulService,
-                AsyncWebServer *     server,
-                const char *         webSocketPath,
-                size_t               bufferSize = DEFAULT_BUFFER_SIZE)
-        : WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize)
-        , _stateUpdater(stateUpdater) {
-    }
-
-  protected:
-    virtual void onWSEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t * data, size_t len) {
-        if (type == WS_EVT_DATA) {
-            AwsFrameInfo * info = (AwsFrameInfo *)arg;
-            if (info->final && info->index == 0 && info->len == len) {
-                if (info->opcode == WS_TEXT) {
-                    DynamicJsonDocument  jsonDocument = DynamicJsonDocument(WebSocketConnector<T>::_bufferSize);
-                    DeserializationError error        = deserializeJson(jsonDocument, (char *)data);
-                    if (!error && jsonDocument.is<JsonObject>()) {
-                        JsonObject jsonObject = jsonDocument.as<JsonObject>();
-                        WebSocketConnector<T>::_statefulService->update(jsonObject, _stateUpdater, WebSocketConnector<T>::clientId(client));
-                    }
-                }
-            }
-        }
-    }
-
-  private:
-    JsonStateUpdater<T> _stateUpdater;
-};
-
-template <class T>
-class WebSocketTxRx : public WebSocketTx<T>, public WebSocketRx<T> {
-  public:
-    WebSocketTxRx(JsonStateReader<T>      stateReader,
-                  JsonStateUpdater<T>     stateUpdater,
-                  StatefulService<T> *    statefulService,
-                  AsyncWebServer *        server,
-                  const char *            webSocketPath,
-                  SecurityManager *       securityManager,
-                  AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                  size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
-        : WebSocketConnector<T>(statefulService, server, webSocketPath, securityManager, authenticationPredicate, bufferSize)
-        , WebSocketTx<T>(stateReader, statefulService, server, webSocketPath, securityManager, authenticationPredicate, bufferSize)
-        , WebSocketRx<T>(stateUpdater, statefulService, server, webSocketPath, securityManager, authenticationPredicate, bufferSize) {
-    }
-
-    WebSocketTxRx(JsonStateReader<T>   stateReader,
-                  JsonStateUpdater<T>  stateUpdater,
-                  StatefulService<T> * statefulService,
-                  AsyncWebServer *     server,
-                  const char *         webSocketPath,
-                  size_t               bufferSize = DEFAULT_BUFFER_SIZE)
-        : WebSocketConnector<T>(statefulService, server, webSocketPath, bufferSize)
-        , WebSocketTx<T>(stateReader, statefulService, server, webSocketPath, bufferSize)
-        , WebSocketRx<T>(stateUpdater, statefulService, server, webSocketPath, bufferSize) {
-    }
-
-  protected:
-    void onWSEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t * data, size_t len) {
-        WebSocketRx<T>::onWSEvent(server, client, type, arg, data, len);
-        WebSocketTx<T>::onWSEvent(server, client, type, arg, data, len);
-    }
-};
-
-#endif
diff --git a/lib/framework/WiFiScanner.cpp b/lib/framework/WiFiScanner.cpp
index 3813c9ff6..51fd74bc1 100644
--- a/lib/framework/WiFiScanner.cpp
+++ b/lib/framework/WiFiScanner.cpp
@@ -23,11 +23,11 @@ void WiFiScanner::scanNetworks(AsyncWebServerRequest * request) {
 void WiFiScanner::listNetworks(AsyncWebServerRequest * request) {
     int numNetworks = WiFi.scanComplete();
     if (numNetworks > -1) {
-        AsyncJsonResponse * response = new AsyncJsonResponse(false, MAX_WIFI_SCANNER_SIZE);
+        AsyncJsonResponse * response = new AsyncJsonResponse(false);
         JsonObject          root     = response->getRoot();
-        JsonArray           networks = root.createNestedArray("networks");
+        JsonArray           networks = root["networks"].to<JsonArray>();
         for (int i = 0; i < numNetworks; i++) {
-            JsonObject network         = networks.createNestedObject();
+            JsonObject network         = networks.add<JsonObject>();
             network["rssi"]            = WiFi.RSSI(i);
             network["ssid"]            = WiFi.SSID(i);
             network["bssid"]           = WiFi.BSSIDstr(i);
diff --git a/lib/framework/WiFiScanner.h b/lib/framework/WiFiScanner.h
index aab364e7a..f73097477 100644
--- a/lib/framework/WiFiScanner.h
+++ b/lib/framework/WiFiScanner.h
@@ -11,7 +11,7 @@
 #define SCAN_NETWORKS_SERVICE_PATH "/rest/scanNetworks"
 #define LIST_NETWORKS_SERVICE_PATH "/rest/listNetworks"
 
-#define MAX_WIFI_SCANNER_SIZE 1024
+// #define MAX_WIFI_SCANNER_SIZE 1024
 
 class WiFiScanner {
   public:
diff --git a/lib_standalone/AsyncJson.h b/lib_standalone/AsyncJson.h
index 2ec4a6322..6ab5a5c35 100644
--- a/lib_standalone/AsyncJson.h
+++ b/lib_standalone/AsyncJson.h
@@ -42,25 +42,24 @@ class ChunkPrint : public Print {
 
 class PrettyAsyncJsonResponse {
   protected:
-    DynamicJsonDocument _jsonBuffer;
+    JsonDocument _jsonBuffer;
 
     JsonVariant _root;
     bool        _isValid;
 
   public:
-    PrettyAsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE)
-        : _jsonBuffer(maxJsonBufferSize)
-        , _isValid{false} {
+    PrettyAsyncJsonResponse(bool isArray = false)
+        : _isValid{false} {
         if (isArray)
-            _root = _jsonBuffer.createNestedArray();
+            _root = _jsonBuffer.to<JsonArray>();
         else
-            _root = _jsonBuffer.createNestedObject();
+            _root = _jsonBuffer.add<JsonObject>();
     }
 
     ~PrettyAsyncJsonResponse() {
     }
 
-    JsonVariant & getRoot() {
+    JsonVariant getRoot() {
         return _root;
     }
 
@@ -89,24 +88,23 @@ class PrettyAsyncJsonResponse {
 
 class MsgpackAsyncJsonResponse {
   protected:
-    DynamicJsonDocument _jsonBuffer;
-    JsonVariant         _root;
-    bool                _isValid;
+    JsonDocument _jsonBuffer;
+    JsonVariant  _root;
+    bool         _isValid;
 
   public:
-    MsgpackAsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE)
-        : _jsonBuffer(maxJsonBufferSize)
-        , _isValid{false} {
+    MsgpackAsyncJsonResponse(bool isArray = false)
+        : _isValid{false} {
         if (isArray)
-            _root = _jsonBuffer.createNestedArray();
+            _root = _jsonBuffer.to<JsonArray>();
         else
-            _root = _jsonBuffer.createNestedObject();
+            _root = _jsonBuffer.add<JsonObject>();
     }
 
     ~MsgpackAsyncJsonResponse() {
     }
 
-    JsonVariant & getRoot() {
+    JsonVariant getRoot() {
         return _root;
     }
 
@@ -135,25 +133,24 @@ class MsgpackAsyncJsonResponse {
 
 class AsyncJsonResponse {
   protected:
-    DynamicJsonDocument _jsonBuffer;
+    JsonDocument _jsonBuffer;
 
     JsonVariant _root;
     bool        _isValid;
 
   public:
-    AsyncJsonResponse(bool isArray = false, size_t maxJsonBufferSize = DYNAMIC_JSON_DOCUMENT_SIZE)
-        : _jsonBuffer(maxJsonBufferSize)
-        , _isValid{false} {
+    AsyncJsonResponse(bool isArray = false)
+        : _isValid{false} {
         if (isArray)
-            _root = _jsonBuffer.createNestedArray();
+            _root = _jsonBuffer.to<JsonArray>();
         else
-            _root = _jsonBuffer.createNestedObject();
+            _root = _jsonBuffer.add<JsonObject>();
     }
 
     ~AsyncJsonResponse() {
     }
 
-    JsonVariant & getRoot() {
+    JsonVariant getRoot() {
         return _root;
     }
 
@@ -175,9 +172,12 @@ class AsyncJsonResponse {
 
     void setCode(uint16_t) {
     }
+
+    void setContentType(const char * s) {
+    }
 };
 
-typedef std::function<void(AsyncWebServerRequest * request, JsonVariant & json)> ArJsonRequestHandlerFunction;
+typedef std::function<void(AsyncWebServerRequest * request, JsonVariant json)> ArJsonRequestHandlerFunction;
 
 class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
   private:
@@ -224,7 +224,7 @@ class AsyncCallbackJsonWebHandler : public AsyncWebHandler {
     virtual void handleRequest(AsyncWebServerRequest * request) override final {
         if (_onRequest) {
             if (request->_tempObject != NULL) {
-                DynamicJsonDocument  jsonBuffer(1024);
+                JsonDocument         jsonBuffer;
                 DeserializationError error = deserializeJson(jsonBuffer, (uint8_t *)(request->_tempObject));
                 if (!error) {
                     JsonVariant json = jsonBuffer.as<JsonVariant>();
diff --git a/lib_standalone/ESP8266React.h b/lib_standalone/ESP8266React.h
index b19417273..68174ea61 100644
--- a/lib_standalone/ESP8266React.h
+++ b/lib_standalone/ESP8266React.h
@@ -75,10 +75,10 @@ class DummySettings {
     bool   enableCORS     = false;
     String CORSOrigin     = "*";
 
-    static void read(DummySettings & settings, JsonObject & root){};
+    static void read(DummySettings & settings, JsonObject root){};
     static void read(DummySettings & settings){};
 
-    static StateUpdateResult update(JsonObject & root, DummySettings & settings) {
+    static StateUpdateResult update(JsonObject root, DummySettings & settings) {
         return StateUpdateResult::CHANGED;
     }
 };
@@ -152,7 +152,7 @@ class EMSESPSettingsService {
 
 class JsonUtils {
   public:
-    static void writeIP(JsonObject & root, const String & key, const String & ip) {
+    static void writeIP(JsonObject root, const String & key, const String & ip) {
         root[key] = ip;
     }
 };
diff --git a/lib_standalone/FSPersistence.h b/lib_standalone/FSPersistence.h
index a547b26f8..df37ef67f 100644
--- a/lib_standalone/FSPersistence.h
+++ b/lib_standalone/FSPersistence.h
@@ -7,18 +7,12 @@
 template <class T>
 class FSPersistence {
   public:
-    FSPersistence(JsonStateReader<T>   stateReader,
-                  JsonStateUpdater<T>  stateUpdater,
-                  StatefulService<T> * statefulService,
-                  FS *                 fs,
-                  const char *         filePath,
-                  size_t               bufferSize = FS_BUFFER_SIZE)
+    FSPersistence(JsonStateReader<T> stateReader, JsonStateUpdater<T> stateUpdater, StatefulService<T> * statefulService, FS * fs, const char * filePath)
         : _stateReader(stateReader)
         , _stateUpdater(stateUpdater)
         , _statefulService(statefulService)
         , _fs(fs)
         , _filePath(filePath)
-        , _bufferSize(bufferSize)
         , _updateHandlerId(0) {
         enableUpdateHandler();
     }
@@ -31,8 +25,8 @@ class FSPersistence {
     }
 
     bool writeToFS() {
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
-        JsonObject          jsonObject   = jsonDocument.to<JsonObject>();
+        JsonDocument jsonDocument;
+        JsonObject   jsonObject = jsonDocument.to<JsonObject>();
         _statefulService->read(jsonObject, _stateReader);
         return true;
     }
@@ -56,13 +50,12 @@ class FSPersistence {
     StatefulService<T> * _statefulService;
     FS *                 _fs;
     const char *         _filePath;
-    size_t               _bufferSize;
     update_handler_id_t  _updateHandlerId;
 
   protected:
     virtual void applyDefaults() {
-        DynamicJsonDocument jsonDocument = DynamicJsonDocument(_bufferSize);
-        JsonObject          jsonObject   = jsonDocument.as<JsonObject>();
+        JsonDocument jsonDocument;
+        JsonObject   jsonObject = jsonDocument.as<JsonObject>();
         _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
     }
 };
diff --git a/lib_standalone/HttpEndpoint.h b/lib_standalone/HttpEndpoint.h
index f06662702..e3fae9ba0 100644
--- a/lib_standalone/HttpEndpoint.h
+++ b/lib_standalone/HttpEndpoint.h
@@ -19,27 +19,19 @@ class HttpGetEndpoint {
                     AsyncWebServer *        server,
                     const String &          servicePath,
                     SecurityManager *       securityManager,
-                    AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                    size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
+                    AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN)
         : _stateReader(stateReader)
-        , _statefulService(statefulService)
-        , _bufferSize(bufferSize) {
+        , _statefulService(statefulService) {
     }
 
-    HttpGetEndpoint(JsonStateReader<T>   stateReader,
-                    StatefulService<T> * statefulService,
-                    AsyncWebServer *     server,
-                    const String &       servicePath,
-                    size_t               bufferSize = DEFAULT_BUFFER_SIZE)
+    HttpGetEndpoint(JsonStateReader<T> stateReader, StatefulService<T> * statefulService, AsyncWebServer * server, const String & servicePath)
         : _stateReader(stateReader)
-        , _statefulService(statefulService)
-        , _bufferSize(bufferSize) {
+        , _statefulService(statefulService) {
     }
 
   protected:
     JsonStateReader<T>   _stateReader;
     StatefulService<T> * _statefulService;
-    size_t               _bufferSize;
 
     void fetchSettings(AsyncWebServerRequest * request) {
     }
@@ -54,33 +46,28 @@ class HttpPostEndpoint {
                      AsyncWebServer *        server,
                      const String &          servicePath,
                      SecurityManager *       securityManager,
-                     AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                     size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
+                     AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN)
         : _stateReader(stateReader)
         , _stateUpdater(stateUpdater)
-        , _statefulService(statefulService)
-        , _bufferSize(bufferSize) {
+        , _statefulService(statefulService) {
     }
 
     HttpPostEndpoint(JsonStateReader<T>   stateReader,
                      JsonStateUpdater<T>  stateUpdater,
                      StatefulService<T> * statefulService,
                      AsyncWebServer *     server,
-                     const String &       servicePath,
-                     size_t               bufferSize = DEFAULT_BUFFER_SIZE)
+                     const String &       servicePath)
         : _stateReader(stateReader)
         , _stateUpdater(stateUpdater)
-        , _statefulService(statefulService)
-        , _bufferSize(bufferSize) {
+        , _statefulService(statefulService) {
     }
 
   protected:
     JsonStateReader<T>   _stateReader;
     JsonStateUpdater<T>  _stateUpdater;
     StatefulService<T> * _statefulService;
-    size_t               _bufferSize;
 
-    void updateSettings(AsyncWebServerRequest * request, JsonVariant & json) {
+    void updateSettings(AsyncWebServerRequest * request, JsonVariant json) {
         if (!json.is<JsonObject>()) {
             return;
         }
@@ -103,20 +90,18 @@ class HttpEndpoint : public HttpGetEndpoint<T>, public HttpPostEndpoint<T> {
                  AsyncWebServer *        server,
                  const String &          servicePath,
                  SecurityManager *       securityManager,
-                 AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN,
-                 size_t                  bufferSize              = DEFAULT_BUFFER_SIZE)
-        : HttpGetEndpoint<T>(stateReader, statefulService, server, servicePath, securityManager, authenticationPredicate, bufferSize)
-        , HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath, securityManager, authenticationPredicate, bufferSize) {
+                 AuthenticationPredicate authenticationPredicate = AuthenticationPredicates::IS_ADMIN)
+        : HttpGetEndpoint<T>(stateReader, statefulService, server, servicePath, securityManager, authenticationPredicate)
+        , HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath, securityManager, authenticationPredicate) {
     }
 
     HttpEndpoint(JsonStateReader<T>   stateReader,
                  JsonStateUpdater<T>  stateUpdater,
                  StatefulService<T> * statefulService,
                  AsyncWebServer *     server,
-                 const String &       servicePath,
-                 size_t               bufferSize = DEFAULT_BUFFER_SIZE)
-        : HttpGetEndpoint<T>(stateReader, statefulService, server, servicePath, bufferSize)
-        , HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath, bufferSize) {
+                 const String &       servicePath)
+        : HttpGetEndpoint<T>(stateReader, statefulService, server, servicePath)
+        , HttpPostEndpoint<T>(stateReader, stateUpdater, statefulService, server, servicePath) {
     }
 };
 
diff --git a/lib_standalone/SecuritySettingsService.cpp b/lib_standalone/SecuritySettingsService.cpp
index c77130caa..7cc393418 100644
--- a/lib_standalone/SecuritySettingsService.cpp
+++ b/lib_standalone/SecuritySettingsService.cpp
@@ -39,7 +39,7 @@ void SecuritySettingsService::configureJWTHandler() {
 }
 
 Authentication SecuritySettingsService::authenticateJWT(String & jwt) {
-    DynamicJsonDocument payloadDocument(MAX_JWT_SIZE);
+    JsonDocument payloadDocument;
     _jwtHandler.parseJWT(jwt, payloadDocument);
     if (payloadDocument.is<JsonObject>()) {
         JsonObject parsedPayload = payloadDocument.as<JsonObject>();
@@ -62,21 +62,21 @@ Authentication SecuritySettingsService::authenticate(const String & username, co
     return Authentication();
 }
 
-inline void populateJWTPayload(JsonObject & payload, User * user) {
+inline void populateJWTPayload(JsonObject payload, User * user) {
     payload["username"] = user->username;
     payload["admin"]    = user->admin;
 }
 
-boolean SecuritySettingsService::validatePayload(JsonObject & parsedPayload, User * user) {
-    DynamicJsonDocument jsonDocument(MAX_JWT_SIZE);
-    JsonObject          payload = jsonDocument.to<JsonObject>();
+boolean SecuritySettingsService::validatePayload(JsonObject parsedPayload, User * user) {
+    JsonDocument jsonDocument;
+    JsonObject   payload = jsonDocument.to<JsonObject>();
     populateJWTPayload(payload, user);
     return payload == parsedPayload;
 }
 
 String SecuritySettingsService::generateJWT(User * user) {
-    DynamicJsonDocument jsonDocument(MAX_JWT_SIZE);
-    JsonObject          payload = jsonDocument.to<JsonObject>();
+    JsonDocument jsonDocument;
+    JsonObject   payload = jsonDocument.to<JsonObject>();
     populateJWTPayload(payload, user);
     return _jwtHandler.buildJWT(payload);
 }
@@ -100,7 +100,7 @@ ArRequestHandlerFunction SecuritySettingsService::wrapRequest(ArRequestHandlerFu
 }
 
 ArJsonRequestHandlerFunction SecuritySettingsService::wrapCallback(ArJsonRequestHandlerFunction onRequest, AuthenticationPredicate predicate) {
-    return [this, onRequest, predicate](AsyncWebServerRequest * request, JsonVariant & json) {
+    return [this, onRequest, predicate](AsyncWebServerRequest * request, JsonVariant json) {
         Authentication authentication = authenticateRequest(request);
         if (!predicate(authentication)) {
             request->send(401);
diff --git a/lib_standalone/SecuritySettingsService.h b/lib_standalone/SecuritySettingsService.h
index acc4dec7d..a283854e0 100644
--- a/lib_standalone/SecuritySettingsService.h
+++ b/lib_standalone/SecuritySettingsService.h
@@ -32,21 +32,21 @@ class SecuritySettings {
     String          jwtSecret;
     std::list<User> users;
 
-    static void read(SecuritySettings & settings, JsonObject & root) {
+    static void read(SecuritySettings & settings, JsonObject root) {
         // secret
         root["jwt_secret"] = settings.jwtSecret;
 
         // users
-        JsonArray users = root.createNestedArray("users");
+        JsonArray users = root["users"].to<JsonArray>();
         for (User user : settings.users) {
-            JsonObject userRoot  = users.createNestedObject();
+            JsonObject userRoot  = users.add<JsonObject>();
             userRoot["username"] = user.username;
             userRoot["password"] = user.password;
             userRoot["admin"]    = user.admin;
         }
     }
 
-    static StateUpdateResult update(JsonObject & root, SecuritySettings & settings) {
+    static StateUpdateResult update(JsonObject root, SecuritySettings & settings) {
         // secret
         settings.jwtSecret = root["jwt_secret"] | FACTORY_JWT_SECRET;
 
@@ -85,7 +85,7 @@ class SecuritySettingsService : public StatefulService<SecuritySettings>, public
 
     void           configureJWTHandler();
     Authentication authenticateJWT(String & jwt);
-    boolean        validatePayload(JsonObject & parsedPayload, User * user);
+    boolean        validatePayload(JsonObject parsedPayload, User * user);
 };
 
 #else
diff --git a/lib_standalone/StatefulService.h b/lib_standalone/StatefulService.h
index d45195cc2..577b51fbb 100644
--- a/lib_standalone/StatefulService.h
+++ b/lib_standalone/StatefulService.h
@@ -7,14 +7,6 @@
 #include <list>
 #include <functional>
 
-#ifndef DEFAULT_BUFFER_SIZE
-#define DEFAULT_BUFFER_SIZE 2048
-#endif
-
-#ifndef FS_BUFFER_SIZE
-#define FS_BUFFER_SIZE 8192
-#endif
-
 enum class StateUpdateResult {
     CHANGED = 0,     // The update changed the state and propagation should take place if required
     CHANGED_RESTART, // The update changed the state and the service should be restarted
@@ -23,10 +15,10 @@ enum class StateUpdateResult {
 };
 
 template <typename T>
-using JsonStateUpdater = std::function<StateUpdateResult(JsonObject & root, T & settings)>;
+using JsonStateUpdater = std::function<StateUpdateResult(JsonObject root, T & settings)>;
 
 template <typename T>
-using JsonStateReader = std::function<void(T & settings, JsonObject & root)>;
+using JsonStateReader = std::function<void(T & settings, JsonObject root)>;
 
 typedef size_t                                       update_handler_id_t;
 typedef std::function<void(const String & originId)> StateUpdateCallback;
@@ -93,7 +85,7 @@ class StatefulService {
         return result;
     }
 
-    StateUpdateResult update(JsonObject & jsonObject, JsonStateUpdater<T> stateUpdater, const String & originId) {
+    StateUpdateResult update(JsonObject jsonObject, JsonStateUpdater<T> stateUpdater, const String & originId) {
         beginTransaction();
         StateUpdateResult result = stateUpdater(jsonObject, _state);
         endTransaction();
@@ -103,7 +95,7 @@ class StatefulService {
         return result;
     }
 
-    StateUpdateResult updateWithoutPropagation(JsonObject & jsonObject, JsonStateUpdater<T> stateUpdater) {
+    StateUpdateResult updateWithoutPropagation(JsonObject jsonObject, JsonStateUpdater<T> stateUpdater) {
         beginTransaction();
         StateUpdateResult result = stateUpdater(jsonObject, _state);
         endTransaction();
@@ -116,7 +108,7 @@ class StatefulService {
         endTransaction();
     }
 
-    void read(JsonObject & jsonObject, JsonStateReader<T> stateReader) {
+    void read(JsonObject jsonObject, JsonStateReader<T> stateReader) {
         beginTransaction();
         stateReader(_state, jsonObject);
         endTransaction();
diff --git a/lib_standalone/emsuart_standalone.cpp b/lib_standalone/emsuart_standalone.cpp
index 7d0e14fe3..56ac5271e 100644
--- a/lib_standalone/emsuart_standalone.cpp
+++ b/lib_standalone/emsuart_standalone.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/lib_standalone/emsuart_standalone.h b/lib_standalone/emsuart_standalone.h
index 2e6ea8797..ab63a9a0e 100644
--- a/lib_standalone/emsuart_standalone.h
+++ b/lib_standalone/emsuart_standalone.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/mock-api/Handler.ts b/mock-api/Handler.ts
index fc519a0eb..08d26b876 100644
--- a/mock-api/Handler.ts
+++ b/mock-api/Handler.ts
@@ -5,7 +5,7 @@ import busboy from 'busboy';
 
 const encoder = new Encoder();
 const router = Router();
-// const upload = multer({ dest: '../mock-api/uploads' }); // TODO remove
+// const upload = multer({ dest: '../mock-api/uploads' }); // TODO remove muter
 
 const REST_ENDPOINT_ROOT = '/rest/';
 const API_ENDPOINT_ROOT = '/api/';
@@ -249,7 +249,8 @@ const network_status = {
   subnet_mask: '255.255.255.0',
   gateway_ip: '10.10.10.1',
   dns_ip_1: '10.10.10.1',
-  dns_ip_2: '0.0.0.0'
+  dns_ip_2: '0.0.0.0',
+  hostname: 'ems-esp'
 };
 const list_networks = {
   networks: [
@@ -413,28 +414,35 @@ const signin = {
 };
 const generate_token = { token: '1234' };
 
+//
 // EMS-ESP Project specific
+//
 const EMSESP_SETTINGS_ENDPOINT = REST_ENDPOINT_ROOT + 'settings';
 const EMSESP_CORE_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'coreData';
 const EMSESP_SENSOR_DATA_ENDPOINT = REST_ENDPOINT_ROOT + 'sensorData';
 const EMSESP_DEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'devices';
 const EMSESP_SCANDEVICES_ENDPOINT = REST_ENDPOINT_ROOT + 'scanDevices';
-
 // const EMSESP_DEVICEDATA_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceData/:id';
 // const EMSESP_DEVICEENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceEntities/:id';
-
 const EMSESP_DEVICEDATA_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceData';
 const EMSESP_DEVICEENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'deviceEntities';
-
 const EMSESP_STATUS_ENDPOINT = REST_ENDPOINT_ROOT + 'status';
 const EMSESP_BOARDPROFILE_ENDPOINT = REST_ENDPOINT_ROOT + 'boardProfile';
-const EMSESP_WRITE_VALUE_ENDPOINT = REST_ENDPOINT_ROOT + 'writeDeviceValue';
-const EMSESP_WRITE_SENSOR_ENDPOINT = REST_ENDPOINT_ROOT + 'writeTemperatureSensor';
-const EMSESP_WRITE_ANALOG_ENDPOINT = REST_ENDPOINT_ROOT + 'writeAnalogSensor';
+const EMSESP_WRITE_DEVICEVALUE_ENDPOINT = REST_ENDPOINT_ROOT + 'writeDeviceValue';
+const EMSESP_WRITE_TEMPSENSOR_ENDPOINT = REST_ENDPOINT_ROOT + 'writeTemperatureSensor';
+const EMSESP_WRITE_ANALOGSENSOR_ENDPOINT = REST_ENDPOINT_ROOT + 'writeAnalogSensor';
 const EMSESP_CUSTOMIZATION_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'customizationEntities';
 const EMSESP_RESET_CUSTOMIZATIONS_ENDPOINT = REST_ENDPOINT_ROOT + 'resetCustomizations';
-const EMSESP_WRITE_SCHEDULE_ENDPOINT = REST_ENDPOINT_ROOT + 'schedule';
-const EMSESP_WRITE_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'entities';
+
+const EMSESP_SCHEDULE_ENDPOINT = REST_ENDPOINT_ROOT + 'schedule';
+const EMSESP_CUSTOMENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'customEntities';
+
+const EMSESP_GET_SETTINGS_ENDPOINT = REST_ENDPOINT_ROOT + 'getSettings';
+const EMSESP_GET_CUSTOMIZATIONS_ENDPOINT = REST_ENDPOINT_ROOT + 'getCustomizations';
+const EMSESP_GET_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'getEntities';
+const EMSESP_GET_SCHEDULE_ENDPOINT = REST_ENDPOINT_ROOT + 'getSchedule';
+
+const EMSESP_SYSTEM_INFO_ENDPOINT = API_ENDPOINT_ROOT + 'system/info';
 
 const emsesp_info = {
   System: {
@@ -565,7 +573,7 @@ const emsesp_allvalues = {
     'date/time': '10.12.2023 13:49',
     'hc1 how hot lounge should be': 19,
     'hc1 current room temp': 19.5,
-    'hc1 Discovery current room temperature': 'roomTemp',
+    'hc1 mqtt discovery current room temperature': 'roomTemp',
     'hc1 mode': 'auto',
     'hc1 manual temperature': 21.5,
     'hc1 temperature when mode is off': 7,
@@ -651,6 +659,7 @@ const emsesp_devices = {
 
 const emsesp_coredata = {
   connected: true,
+  // connected: false,
   // devices: [],
   devices: [
     {
@@ -740,7 +749,7 @@ const emsesp_coredata = {
       d: 1,
       p: 1,
       v: '',
-      e: 1
+      e: 2
     }
   ]
 };
@@ -786,7 +795,7 @@ const status = {
 // 1 - RC35 thermo
 // 2 - RC20 thermo
 // 3 - Buderus GB125 boiler
-// 4 - RC100 themo
+// 4 - RC100 thermostat
 // 5 - Mixer MM10
 // 6 - Solar SM10
 // 7 - Nefit Trendline boiler
@@ -2046,6 +2055,11 @@ const emsesp_devicedata_99 = {
       u: 1,
       id: '00boiler_flowtemp',
       c: 'boiler_flowtemp'
+    },
+    {
+      v: 0,
+      u: 0,
+      id: '00wwExtra1'
     }
   ]
 };
@@ -2056,6 +2070,7 @@ let emsesp_customentities = {
   entities: [
     {
       id: 0,
+      ram: 0,
       device_id: 8,
       type_id: 24,
       offset: 0,
@@ -2063,7 +2078,21 @@ let emsesp_customentities = {
       name: 'boiler_flowtemp',
       uom: 1,
       value_type: 1,
-      writeable: true
+      writeable: true,
+      value: 30
+    },
+    {
+      id: 1,
+      ram: 0,
+      device_id: 16,
+      type_id: 797,
+      offset: 0,
+      factor: 1,
+      name: 'wwExtra1',
+      uom: 0,
+      value_type: 0,
+      writeable: false,
+      value: 0
     }
   ]
 };
@@ -2343,6 +2372,7 @@ router
 // SYSTEM
 router
   .get(SYSTEM_STATUS_ENDPOINT, () => new Response(JSON.stringify(system_status), { headers }))
+  .get(SECURITY_SETTINGS_ENDPOINT, () => new Response(JSON.stringify(security_settings), { headers }))
   .post(SECURITY_SETTINGS_ENDPOINT, async (request: any) => {
     security_settings = await request.json();
     return new Response('OK', { status: 200 });
@@ -2351,11 +2381,11 @@ router
   .get(VERIFY_AUTHORIZATION_ENDPOINT, () => new Response(JSON.stringify(verify_authentication), { headers }))
   .post(RESTART_ENDPOINT, () => new Response('OK', { status: 200 }))
   .post(FACTORY_RESET_ENDPOINT, () => new Response('OK', { status: 200 }))
-  .post(UPLOAD_FILE_ENDPOINT, () => new Response('OK', { status: 404 })) // TODO remove
+  .post(UPLOAD_FILE_ENDPOINT, () => new Response('OK', { status: 404 })) // TODO remove upload when fixed
   .post(SIGN_IN_ENDPOINT, () => new Response(JSON.stringify(signin), { headers }))
   .get(GENERATE_TOKEN_ENDPOINT, () => new Response(JSON.stringify(generate_token), { headers }));
 
-// uploads // TODO fix later
+// uploads // TODO fix uploading later
 
 // const progress_middleware = async (req: any) => {
 //   console.log('progress_middleware');
@@ -2456,15 +2486,16 @@ router
 //  EMS-ESP Project stuff
 //
 router
-  .post(EMSESP_RESET_CUSTOMIZATIONS_ENDPOINT, async (request: any) => {
-    return new Response('OK', { status: 200 });
-  })
+
+  // EMS-ESP Settings
   .get(EMSESP_SETTINGS_ENDPOINT, () => new Response(JSON.stringify(settings), { headers }))
   .post(EMSESP_SETTINGS_ENDPOINT, async (request: any) => {
     settings = await request.json();
     return new Response('OK', { status: 200 }); // no restart needed
     // return new Response('OK', { status: 205 }); // restart needed
   })
+
+  // Device Dashboard Data
   .get(EMSESP_CORE_DATA_ENDPOINT, () => new Response(JSON.stringify(emsesp_coredata), { headers }))
   .get(EMSESP_SENSOR_DATA_ENDPOINT, () => new Response(JSON.stringify(emsesp_sensordata), { headers }))
   .get(EMSESP_DEVICES_ENDPOINT, () => new Response(JSON.stringify(emsesp_devices), { headers }))
@@ -2525,6 +2556,8 @@ router
       return new Response(encoder.encode(emsesp_deviceentities_7), { headers });
     }
   })
+
+  // Customization
   .post(EMSESP_CUSTOMIZATION_ENTITIES_ENDPOINT, async (request: any) => {
     const content = await request.json();
     const id = content.id;
@@ -2547,17 +2580,28 @@ router
     }
     return new Response('OK', { status: 200 });
   })
-  .post(EMSESP_WRITE_SCHEDULE_ENDPOINT, async (request: any) => {
+  .post(EMSESP_RESET_CUSTOMIZATIONS_ENDPOINT, async (request: any) => {
+    return new Response('OK', { status: 200 });
+  })
+
+  // Scheduler
+  .post(EMSESP_SCHEDULE_ENDPOINT, async (request: any) => {
     const content = await request.json();
     emsesp_schedule = content;
     return new Response('OK', { status: 200 });
   })
-  .post(EMSESP_WRITE_ENTITIES_ENDPOINT, async (request: any) => {
+  .get(EMSESP_SCHEDULE_ENDPOINT, () => new Response(JSON.stringify(emsesp_schedule), { headers }))
+
+  // Custom Entities
+  .post(EMSESP_CUSTOMENTITIES_ENDPOINT, async (request: any) => {
     const content = await request.json();
     emsesp_customentities = content;
     return new Response('OK', { status: 200 });
   })
-  .post(EMSESP_WRITE_VALUE_ENDPOINT, async (request: any) => {
+  .get(EMSESP_CUSTOMENTITIES_ENDPOINT, () => new Response(JSON.stringify(emsesp_customentities), { headers }))
+
+  // Device Dashboard
+  .post(EMSESP_WRITE_DEVICEVALUE_ENDPOINT, async (request: any) => {
     const content = await request.json();
     const command = content.c;
     const value = content.v;
@@ -2601,7 +2645,9 @@ router
     await delay(1000); // wait to show spinner
     return new Response('OK', { status: 200 }); // or 400 for bad request
   })
-  .post(EMSESP_WRITE_SENSOR_ENDPOINT, async (request: any) => {
+
+  // Temperature & Analog Sensors
+  .post(EMSESP_WRITE_TEMPSENSOR_ENDPOINT, async (request: any) => {
     const ts = await request.json();
     var objIndex = emsesp_sensordata.ts.findIndex((obj) => obj.id == ts.id_str);
     if (objIndex !== -1) {
@@ -2610,7 +2656,7 @@ router
     }
     return new Response('OK', { status: 200 });
   })
-  .post(EMSESP_WRITE_ANALOG_ENDPOINT, async (request: any) => {
+  .post(EMSESP_WRITE_ANALOGSENSOR_ENDPOINT, async (request: any) => {
     const as = await request.json();
     var objIndex = emsesp_sensordata.as.findIndex((obj) => obj.g == as.gpio);
     if (objIndex === -1) {
@@ -2643,6 +2689,8 @@ router
 
     return new Response('OK', { status: 200 });
   })
+
+  // Settings - board profile
   .post(EMSESP_BOARDPROFILE_ENDPOINT, async (request: any) => {
     const content = await request.json();
     const board_profile = content.code;
@@ -2772,26 +2820,18 @@ router
     }
 
     return new Response(JSON.stringify(data), { headers });
-  });
+  })
 
-// API and calls
-const SYSTEM_INFO_ENDPOINT = API_ENDPOINT_ROOT + 'system/info';
-const GET_SETTINGS_ENDPOINT = REST_ENDPOINT_ROOT + 'getSettings';
-const GET_CUSTOMIZATIONS_ENDPOINT = REST_ENDPOINT_ROOT + 'getCustomizations';
-const GET_ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'getEntities';
-const GET_SCHEDULE_ENDPOINT = REST_ENDPOINT_ROOT + 'getSchedule';
-const SCHEDULE_ENDPOINT = REST_ENDPOINT_ROOT + 'schedule';
-const ENTITIES_ENDPOINT = REST_ENDPOINT_ROOT + 'customentities';
+  // Download Settings
+  .get(EMSESP_GET_SETTINGS_ENDPOINT, () => new Response(JSON.stringify(emsesp_info), { headers }))
+  .get(EMSESP_GET_CUSTOMIZATIONS_ENDPOINT, () => new Response(JSON.stringify(emsesp_deviceentities_1), { headers }))
+  .get(EMSESP_GET_ENTITIES_ENDPOINT, () => new Response(JSON.stringify(emsesp_customentities), { headers }))
+  .get(EMSESP_GET_SCHEDULE_ENDPOINT, () => new Response(JSON.stringify(emsesp_schedule), { headers }));
 
+// API which are usually POST for security
 router
-  .post(SYSTEM_INFO_ENDPOINT, () => new Response(JSON.stringify(emsesp_info), { headers }))
-  .get(SYSTEM_INFO_ENDPOINT, () => new Response(JSON.stringify(emsesp_info), { headers }))
-  .get(GET_SETTINGS_ENDPOINT, () => new Response(JSON.stringify(emsesp_info), { headers }))
-  .get(GET_CUSTOMIZATIONS_ENDPOINT, () => new Response(JSON.stringify(emsesp_deviceentities_1), { headers }))
-  .get(GET_ENTITIES_ENDPOINT, () => new Response(JSON.stringify(emsesp_customentities), { headers }))
-  .get(GET_SCHEDULE_ENDPOINT, () => new Response(JSON.stringify(emsesp_schedule), { headers }))
-  .get(SCHEDULE_ENDPOINT, () => new Response(JSON.stringify(emsesp_schedule), { headers }))
-  .get(ENTITIES_ENDPOINT, () => new Response(JSON.stringify(emsesp_customentities), { headers }))
+  .post(EMSESP_SYSTEM_INFO_ENDPOINT, () => new Response(JSON.stringify(emsesp_info), { headers }))
+  .get(EMSESP_SYSTEM_INFO_ENDPOINT, () => new Response(JSON.stringify(emsesp_info), { headers }))
   .post(API_ENDPOINT_ROOT, async (request: any) => {
     const data = await request.json();
     if (data.device === 'system') {
@@ -2805,7 +2845,9 @@ router
     return new Response('Not Found', { status: 404 });
   });
 
-// Event Source // TODO fix later
+//
+// Event Source // TODO fix event source later
+//
 
 // const data = {
 //   t: '000+00:00:00.000',
diff --git a/mock-api/package.json b/mock-api/package.json
index d74eb41bd..de5e4f285 100644
--- a/mock-api/package.json
+++ b/mock-api/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@msgpack/msgpack": "^2.8.0",
     "busboy": "^1.6.0",
-    "itty-router": "^4.0.25"
+    "itty-router": "^4.0.27"
   },
   "packageManager": "yarn@4.0.2",
   "devDependencies": {
diff --git a/mock-api/yarn.lock b/mock-api/yarn.lock
index 559bd51b0..8d3e1278c 100644
--- a/mock-api/yarn.lock
+++ b/mock-api/yarn.lock
@@ -129,7 +129,7 @@ __metadata:
     "@msgpack/msgpack": "npm:^2.8.0"
     "@types/multer": "npm:^1.4.11"
     busboy: "npm:^1.6.0"
-    itty-router: "npm:^4.0.25"
+    itty-router: "npm:^4.0.27"
   languageName: unknown
   linkType: soft
 
@@ -142,10 +142,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"itty-router@npm:^4.0.25":
-  version: 4.0.25
-  resolution: "itty-router@npm:4.0.25"
-  checksum: befa18a3cda3ab5fcbd21bcdeb87fd5c115e9538c0f5372170a7a73fb36906e373ea1be677d6b9c3cf1864c0f957caf37376e1f2b9e19fc275340fb0cbcbcb18
+"itty-router@npm:^4.0.27":
+  version: 4.0.27
+  resolution: "itty-router@npm:4.0.27"
+  checksum: ebb959388b1033f3d80ba2575c2d90fa649c1d5370d977879513cc46e8fd78159b7140d2a66853af6be98f7d740f8609a2c5aa7381506eaa1f1a46268fd2a95f
   languageName: node
   linkType: hard
 
diff --git a/pio_local.ini_example b/pio_local.ini_example
index 99fa32ed0..77c68f171 100644
--- a/pio_local.ini_example
+++ b/pio_local.ini_example
@@ -1,7 +1,7 @@
-; example custom platformio.ini file for EMS-ESP
+; example custom platformio ini file for EMS-ESP
 
 [common]
-; custom build flags:
+; custom build flags to use in my_build_flags
 ;  -DEMSESP_WIFI_TWEAK ; experimental WiFi tweaks for stability
 ;  -DEMSESP_UART_DEBUG ; debugging UART
 ;  -DEMSESP_DEBUG ; enables DEBUG to the log. Will generate a lot of extra traffic on Console and Syslog
@@ -11,46 +11,73 @@
 ;  -DEMSESP_TEST ; enable the tests. EN language only
 ;  -DEMSESP_DE_ONLY ; only DE translated entity names
 ;  -DEMSESP_EN_ONLY ; only EN translated entity names
-; my_build_flags = -DEMSESP_DEBUG
+; my_build_flags = -DEMSESP_TEST
+; my_build_flags = -DEMSESP_DEBUG -DEMSESP_TEST
 
 [platformio]
-default_envs = esp32_4M
+; default_envs = esp32_4M
 ; default_envs = esp32_16M
 ; default_envs = lolin_s3
 ; default_envs = standalone
-; default_envs =  debug
+; default_envs = debug
+; default_envs = custom
 
 [env:esp32_4M]
-; update to arduino 3, IDF 5
-platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF5
-;
 ; if using OTA enter your details below
 ;  upload_protocol = espota
 ;  upload_flags =
 ;    --port=8266
 ;    --auth=ems-esp-neo
 ;  upload_port = ems-esp.local
-; for USB use
-upload_port = /dev/ttyUSB*
+; for USB, here are some examples:
+; upload_port = /dev/ttyUSB*
 ; upload_port = COM5
-
-; override arduino espressif core
-platform = espressif32 ; take latest
-; platform = espressif32@5.3.0
-; platform = espressif32@6.3.2
-; platform = espressif32@6.4.0
-
 extra_scripts =
-  pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
+;   pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
   scripts/rename_fw.py
-  ; post:scripts/app-tls-size.py
 
 [env:esp32_16M]
 
+[env:custom]
+; use for baisc ESP boards with 4MB flash
+; make sure -D TASMOTA_SDK is also enabled
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.00/platform-espressif32.zip
+; use for S3 boards:
+; platform = espressif32
+framework = arduino
+board = esp32dev
+board_build.filesystem = littlefs
+board_build.f_cpu = 240000000L
+board_upload.flash_size = 4MB
+board_build.partitions = esp32_partition_4M.csv
+board_upload.use_1200bps_touch = false
+board_upload.wait_for_upload_port = true
+upload_port = /dev/ttyUSB0
+extra_scripts = 
+	; pre:scripts/build_interface.py
+	scripts/rename_fw.py
+build_unflags = ${common.unbuild_flags}
+build_flags = 
+	${common.core_build_flags}
+	${factory_settings.build_flags}
+	${common.my_build_flags}
+	-D ONEWIRE_CRC16=0
+	-D NO_GLOBAL_ARDUINOOTA
+	-D ARDUINOJSON_ENABLE_STD_STRING=1
+	-D ARDUINOJSON_USE_DOUBLE=0
+	; -D ARDUINOTRACE_ENABLE=1
+	-D TASMOTA_SDK
+	; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_WARN
+	-D EMSESP_TEST
+	-D EMSESP_DEBUG
+ 	-D CONFIG_ETH_ENABLED
+    -D TASMOTA_SDK
+	'-DEMSESP_DEFAULT_BOARD_PROFILE="Test"'
+
 [env:lolin_s3]
-upload_port = /dev/ttyACM0
+upload_port = /dev/ttyUSB0
 extra_scripts =
-  pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
+;   pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
   scripts/rename_fw.py
 
 ; pio run -e debug
@@ -61,7 +88,6 @@ board = esp32dev
 framework = arduino
 platform = espressif32
 board_build.partitions = esp32_partition_debug.csv
-; board_build.partitions = esp32_partition_4M.csv
 board_upload.flash_size = 4MB
 board_build.filesystem = littlefs
 upload_protocol = esptool
@@ -73,6 +99,5 @@ debug_init_break = tbreak setup
 build_flags = ${factory_settings.build_flags} -DEMSESP_EN_ONLY -DCORE_DEBUG_LEVEL=5 -DONEWIRE_CRC16=0 -DNO_GLOBAL_ARDUINOOTA -DARDUINOJSON_ENABLE_STD_STRING=1 -DESP32=1 -DARDUINO_ARCH_ESP32=1
 upload_port = /dev/ttyUSB0
 extra_scripts =
-  ; pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time
   scripts/rename_fw.py
-  ; post:scripts/app-tls-size.py
+  post:scripts/app-tls-size.py
diff --git a/platformio.ini b/platformio.ini
index e708d80b7..0b38c7e00 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -13,8 +13,6 @@ extra_configs =
 
 [common]
 core_build_flags =
-  -D CORE_DEBUG_LEVEL=0
-  -D NDEBUG
   -D ARDUINO_ARCH_ESP32=1
   -D ESP32=1
   ; -std=gnu++17
@@ -33,13 +31,14 @@ build_flags =
   -D NO_GLOBAL_ARDUINOOTA
   -D ARDUINOJSON_ENABLE_STD_STRING=1
   -D ARDUINOJSON_USE_DOUBLE=0
-  ; -D CONFIG_UART_ISR_IN_IRAM
+  -D ARDUINOTRACE_ENABLE=0
+  -D CONFIG_ETH_ENABLED
 
 unbuild_flags =
   ${common.core_unbuild_flags}
 
 [espressi32_base]
-platform = espressif32@6.4.0
+platform = espressif32@6.5.0
 framework = arduino
 board_build.filesystem = littlefs
 build_flags = ${common.build_flags}
@@ -51,11 +50,9 @@ extra_scripts =
 [espressi32_base_tasmota]
 ; use Tasmota's libary which removes some libs (like mbedtsl) and increases available heap
 ; platform = https://github.com/tasmota/platform-espressif32.git ; latest development
-; latest release with WiFi_secure.h
-platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.10.03/platform-espressif32-2023.10.03.zip ; latest stable
-; latest arduino 2.xx release:
-; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.11.01/platform-espressif32.zip
-; latest arduino 3.0/IDF 5.1.(alpha 3):
+; latest release with WiFi_secure.h, Arduino 2.0.14
+platform = https://github.com/tasmota/platform-espressif32/releases/download/2024.01.00/platform-espressif32.zip
+; latest Arduino 3.0/IDF 5.1.(alpha 3):
 ; platform = https://github.com/tasmota/platform-espressif32/releases/download/2023.12.10/platform-espressif32.zip
 framework = arduino
 board_build.filesystem = littlefs
@@ -69,7 +66,7 @@ extra_scripts =
 
 [env]
 monitor_speed = 115200
-monitor_raw = yes
+monitor_filters = esp32_exception_decoder
 upload_speed = 921600
 build_type = release
 lib_ldf_mode = chain+
@@ -178,7 +175,8 @@ build_flags =
 	-lpthread
   -std=gnu++11 -Og -ggdb
 build_src_flags =
-  -Wall -Wextra -Werror -Wswitch-enum -Wno-unused-parameter -Wno-inconsistent-missing-override -Wno-unused-lambda-capture -Wno-sign-compare
+  ; -Wall -Wextra -Werror -Wswitch-enum -Wno-unused-parameter -Wno-inconsistent-missing-override -Wno-unused-lambda-capture -Wno-sign-compare
+  ; -Wall -Wextra -Werror
   -Wno-missing-braces
   -I./lib_standalone
   -I./lib/ArduinoJson/src
@@ -201,4 +199,4 @@ build_src_filter =
   +<../lib/espMqttClient/src>
   +<../lib/espMqttClient/src/Transport>
 lib_compat_mode = off
-lib_ldf_mode = off
\ No newline at end of file
+lib_ldf_mode = off
diff --git a/scripts/bootloader.bin b/scripts/bootloader.bin
new file mode 100644
index 000000000..01419bff9
Binary files /dev/null and b/scripts/bootloader.bin differ
diff --git a/scripts/bootloader_dio_40m.bin b/scripts/bootloader_dio_40m.bin
deleted file mode 100755
index 3314163fc..000000000
Binary files a/scripts/bootloader_dio_40m.bin and /dev/null differ
diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp
index 61f6cca7f..fce90371d 100644
--- a/src/analogsensor.cpp
+++ b/src/analogsensor.cpp
@@ -37,12 +37,12 @@ void AnalogSensor::start() {
     Command::add(
         EMSdevice::DeviceType::ANALOGSENSOR,
         F_(info),
-        [&](const char * value, const int8_t id, JsonObject & output) { return command_info(value, id, output); },
+        [&](const char * value, const int8_t id, JsonObject output) { return command_info(value, id, output); },
         FL_(info_cmd));
     Command::add(
         EMSdevice::DeviceType::ANALOGSENSOR,
         F_(values),
-        [&](const char * value, const int8_t id, JsonObject & output) { return command_info(value, 0, output); },
+        [&](const char * value, const int8_t id, JsonObject output) { return command_info(value, 0, output); },
         nullptr,
         CommandFlag::HIDDEN); // this command is hidden
     Command::add(
@@ -54,7 +54,7 @@ void AnalogSensor::start() {
     Command::add(
         EMSdevice::DeviceType::ANALOGSENSOR,
         F_(commands),
-        [&](const char * value, const int8_t id, JsonObject & output) { return command_commands(value, id, output); },
+        [&](const char * value, const int8_t id, JsonObject output) { return command_commands(value, id, output); },
         FL_(commands_cmd));
 
     char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
@@ -462,13 +462,13 @@ void AnalogSensor::publish_values(const bool force) {
         }
     }
 
-    DynamicJsonDocument doc(120 * num_sensors);
+    JsonDocument doc;
 
     for (auto & sensor : sensors_) {
         if (sensor.type() != AnalogType::NOTUSED) {
             if (Mqtt::is_nested()) {
                 char       s[10];
-                JsonObject dataSensor = doc.createNestedObject(Helpers::smallitoa(s, sensor.gpio()));
+                JsonObject dataSensor = doc[Helpers::smallitoa(s, sensor.gpio())].to<JsonObject>();
                 dataSensor["name"]    = sensor.name();
                 switch (sensor.type()) {
                 case AnalogType::COUNTER:
@@ -508,11 +508,11 @@ void AnalogSensor::publish_values(const bool force) {
                 doc[sensor.name()] = serialized(Helpers::render_value(s, sensor.value(), 2));
             }
 
-            // create HA config
+            // create HA config if hasn't already been done
             if (Mqtt::ha_enabled() && (!sensor.ha_registered || force)) {
                 LOG_DEBUG("Recreating HA config for analog sensor GPIO %02d", sensor.gpio());
 
-                StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> config;
+                JsonDocument config;
 
                 char stat_t[50];
                 snprintf(stat_t, sizeof(stat_t), "%s/%s_data", Mqtt::base().c_str(), F_(analogsensor)); // use base path
@@ -615,13 +615,16 @@ void AnalogSensor::publish_values(const bool force) {
                     config["stat_cla"] = "measurement";
                 }
 
-                JsonObject dev = config.createNestedObject("dev");
-                dev["name"]    = Mqtt::basename() + " Analog";
-                JsonArray ids  = dev.createNestedArray("ids");
-                ids.add(Mqtt::basename() + "-analog");
+                // see if we need to create the [devs] discovery section, as this needs only to be done once for all sensors
+                bool is_ha_device_created = false;
+                for (auto & sensor : sensors_) {
+                    if (sensor.ha_registered) {
+                        is_ha_device_created = true;
+                        break;
+                    }
+                }
 
-                // add "availability" section
-                Mqtt::add_avty_to_doc(stat_t, config.as<JsonObject>(), val_cond);
+                Mqtt::add_ha_sections_to_doc("analog", stat_t, config, !is_ha_device_created, val_cond);
 
                 sensor.ha_registered = Mqtt::queue_ha(topic, config.as<JsonObject>());
             }
@@ -635,7 +638,7 @@ void AnalogSensor::publish_values(const bool force) {
 
 // called from emsesp.cpp, similar to the emsdevice->get_value_info
 // searches by name
-bool AnalogSensor::get_value_info(JsonObject & output, const char * cmd, const int8_t id) const {
+bool AnalogSensor::get_value_info(JsonObject output, const char * cmd, const int8_t id) const {
     if (sensors_.empty()) {
         return true;
     }
@@ -676,7 +679,7 @@ bool AnalogSensor::get_value_info(JsonObject & output, const char * cmd, const i
             // if we're filtering on an attribute, go find it
             if (attribute_s) {
                 if (output.containsKey(attribute_s)) {
-                    JsonVariant data = output[attribute_s];
+                    String data = output[attribute_s].as<String>();
                     output.clear();
                     output["api_data"] = data;
                     return true;
@@ -696,14 +699,14 @@ bool AnalogSensor::get_value_info(JsonObject & output, const char * cmd, const i
 
 // creates JSON doc from values
 // returns true if there are no sensors
-bool AnalogSensor::command_info(const char * value, const int8_t id, JsonObject & output) const {
+bool AnalogSensor::command_info(const char * value, const int8_t id, JsonObject output) const {
     if (sensors_.empty()) {
         return true;
     }
 
     for (const auto & sensor : sensors_) {
         if (id == -1) { // show number and id for info command
-            JsonObject dataSensor = output.createNestedObject(sensor.name());
+            JsonObject dataSensor = output[sensor.name()].to<JsonObject>();
             dataSensor["gpio"]    = sensor.gpio();
             dataSensor["type"]    = F_(number);
             dataSensor["value"]   = sensor.value();
@@ -848,7 +851,7 @@ bool AnalogSensor::command_setvalue(const char * value, const int8_t gpio) {
 }
 
 // list commands
-bool AnalogSensor::command_commands(const char * value, const int8_t id, JsonObject & output) {
+bool AnalogSensor::command_commands(const char * value, const int8_t id, JsonObject output) {
     return Command::list(EMSdevice::DeviceType::ANALOGSENSOR, output);
 }
 
diff --git a/src/analogsensor.h b/src/analogsensor.h
index b33fb1137..12615298d 100644
--- a/src/analogsensor.h
+++ b/src/analogsensor.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -153,10 +153,10 @@ class AnalogSensor {
     }
 
     bool update(uint8_t gpio, const std::string & name, double offset, double factor, uint8_t uom, int8_t type, bool deleted = false);
-    bool get_value_info(JsonObject & output, const char * cmd, const int8_t id) const;
+    bool get_value_info(JsonObject output, const char * cmd, const int8_t id) const;
     void store_counters();
 
-    bool command_info(const char * value, const int8_t id, JsonObject & output) const;
+    bool command_info(const char * value, const int8_t id, JsonObject output) const;
 
 
 #if defined(EMSESP_TEST)
@@ -172,7 +172,7 @@ class AnalogSensor {
     void remove_ha_topic(const int8_t type, const uint8_t id) const;
     bool command_setvalue(const char * value, const int8_t gpio);
     void measure();
-    bool command_commands(const char * value, const int8_t id, JsonObject & output);
+    bool command_commands(const char * value, const int8_t id, JsonObject output);
 
     std::vector<Sensor> sensors_; // our list of sensors
 
diff --git a/src/command.cpp b/src/command.cpp
index 46a6d7673..2724ff75e 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ std::vector<Command::CmdFunction> Command::cmdfunctions_;
 // the path is leading so if duplicate keys are in the input JSON it will be ignored
 // the entry point will be either via the Web API (api/) or MQTT (<base>/)
 // returns a return code and json output
-uint8_t Command::process(const char * path, const bool is_admin, const JsonObject & input, JsonObject & output) {
+uint8_t Command::process(const char * path, const bool is_admin, const JsonObject input, JsonObject output) {
     SUrlParser p; // parse URL for the path names
     p.parse(path);
 
@@ -278,8 +278,8 @@ const char * Command::parse_command_string(const char * command, int8_t & id) {
 // calls a command directly
 uint8_t Command::call(const uint8_t device_type, const char * cmd, const char * value) {
     // create a temporary buffer
-    StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> output_doc;
-    JsonObject                                 output = output_doc.to<JsonObject>();
+    JsonDocument output_doc;
+    JsonObject   output = output_doc.to<JsonObject>();
 
     // authenticated is always true and ID is the default value
     return call(device_type, cmd, value, true, -1, output);
@@ -288,7 +288,7 @@ uint8_t Command::call(const uint8_t device_type, const char * cmd, const char *
 // calls a command. Takes a json object for output.
 // id may be used to represent a heating circuit for example
 // returns 0 if the command errored, 1 (TRUE) if ok, 2 if not found, 3 if error or 4 if not allowed
-uint8_t Command::call(const uint8_t device_type, const char * cmd, const char * value, const bool is_admin, const int8_t id, JsonObject & output) {
+uint8_t Command::call(const uint8_t device_type, const char * cmd, const char * value, const bool is_admin, const int8_t id, JsonObject output) {
     if (cmd == nullptr) {
         return CommandRet::NOT_FOUND;
     }
@@ -435,7 +435,7 @@ void Command::erase_command(const uint8_t device_type, const char * cmd) {
 }
 
 // list all commands for a specific device, output as json
-bool Command::list(const uint8_t device_type, JsonObject & output) {
+bool Command::list(const uint8_t device_type, JsonObject output) {
     if (cmdfunctions_.empty()) {
         output["message"] = "no commands available";
         return false;
diff --git a/src/command.h b/src/command.h
index f0b54bbf2..79539ec29 100644
--- a/src/command.h
+++ b/src/command.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@ enum CommandRet : uint8_t {
 };
 
 using cmd_function_p      = std::function<bool(const char * data, const int8_t id)>;
-using cmd_json_function_p = std::function<bool(const char * data, const int8_t id, JsonObject & output)>;
+using cmd_json_function_p = std::function<bool(const char * data, const int8_t id, JsonObject output)>;
 
 class Command {
   public:
@@ -96,7 +96,7 @@ class Command {
         return cmdfunctions_;
     }
 
-    static uint8_t call(const uint8_t device_type, const char * cmd, const char * value, const bool is_admin, const int8_t id, JsonObject & output);
+    static uint8_t call(const uint8_t device_type, const char * cmd, const char * value, const bool is_admin, const int8_t id, JsonObject output);
     static uint8_t call(const uint8_t device_type, const char * cmd, const char * value);
 
     // with normal call back function taking a value and id
@@ -129,9 +129,9 @@ class Command {
     static void show_devices(uuid::console::Shell & shell);
     static bool device_has_commands(const uint8_t device_type);
 
-    static bool list(const uint8_t device_type, JsonObject & output);
+    static bool list(const uint8_t device_type, JsonObject output);
 
-    static uint8_t process(const char * path, const bool is_admin, const JsonObject & input, JsonObject & output);
+    static uint8_t process(const char * path, const bool is_admin, const JsonObject input, JsonObject output);
 
     static const char * parse_command_string(const char * command, int8_t & id);
 
@@ -142,7 +142,7 @@ class Command {
 
     static std::vector<CmdFunction> cmdfunctions_; // the list of commands
 
-    inline static uint8_t message(uint8_t error_code, const char * message, const JsonObject & output) {
+    inline static uint8_t message(uint8_t error_code, const char * message, const JsonObject output) {
         output.clear();
         output["message"] = message;
         return error_code;
diff --git a/src/common.h b/src/common.h
index 4583d5562..b212dc870 100644
--- a/src/common.h
+++ b/src/common.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/console.cpp b/src/console.cpp
index 06fd98aba..9d2748d96 100644
--- a/src/console.cpp
+++ b/src/console.cpp
@@ -1,6 +1,7 @@
+
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -127,14 +128,16 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
     commands->add_command(ShellContext::MAIN,
                           CommandFlags::USER,
                           string_vector{"test"},
-                          string_vector{F_(name_optional), F_(data_optional)},
+                          string_vector{F_(name_optional), F_(data_optional), F_(id_optional)},
                           [=](Shell & shell, const std::vector<std::string> & arguments) {
                               if (arguments.empty()) {
                                   Test::run_test(shell, "default");
                               } else if (arguments.size() == 1) {
                                   Test::run_test(shell, arguments.front());
-                              } else {
+                              } else if (arguments.size() == 2) {
                                   Test::run_test(shell, arguments[0].c_str(), arguments[1].c_str());
+                              } else {
+                                  Test::run_test(shell, arguments[0].c_str(), arguments[1].c_str(), arguments[2].c_str());
                               }
                           });
     commands->add_command(ShellContext::MAIN, CommandFlags::USER, string_vector{"t"}, [=](Shell & shell, const std::vector<std::string> & arguments) {
@@ -237,7 +240,7 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
                                                           networkSettings.password = password2.c_str();
                                                           return StateUpdateResult::CHANGED;
                                                       });
-                                                  shell.println("Use `wifi reconnect` to save and apply the new settings");
+                                                  shell.println("WiFi password updated");
                                               } else {
                                                   shell.println("Passwords do not match");
                                               }
@@ -272,7 +275,7 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
                                   networkSettings.ssid = arguments.front().c_str();
                                   return StateUpdateResult::CHANGED;
                               });
-                              shell.println("Use `wifi reconnect` to save and apply the new settings");
+                              shell.println("WiFi ssid updated");
                           });
 
 
@@ -496,11 +499,11 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
                 return;
             }
 
-            DynamicJsonDocument doc(EMSESP_JSON_SIZE_XXXLARGE);
-            int8_t              id          = -1;
-            const char *        cmd         = Command::parse_command_string(arguments[1].c_str(), id);
-            uint8_t             return_code = CommandRet::OK;
-            JsonObject          json        = doc.to<JsonObject>();
+            JsonDocument doc;
+            int8_t       id          = -1;
+            const char * cmd         = Command::parse_command_string(arguments[1].c_str(), id);
+            uint8_t      return_code = CommandRet::OK;
+            JsonObject   json        = doc.to<JsonObject>();
 
             if (cmd == nullptr) {
                 cmd = device_type == EMSdevice::DeviceType::SYSTEM ? F_(info) : F_(values);
@@ -530,15 +533,8 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
 
             if (return_code == CommandRet::OK && json.size()) {
                 if (json.containsKey("api_data")) {
-                    JsonVariant data = json["api_data"];
-                    if (data.is<int>()) {
-                        shell.printfln("%d", data.as<int>());
-                    } else if (data.is<float>()) {
-                        char s[10];
-                        shell.println(Helpers::render_value(s, data.as<float>(), 1));
-                    } else {
-                        shell.println(data.as<const char *>());
-                    }
+                    String data = json["api_data"].as<String>();
+                    shell.println(data.c_str());
                     return;
                 }
                 serializeJsonPretty(doc, shell);
@@ -567,9 +563,9 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
                 }
                 return devices_list;
             } else if (current_arguments.size() == 1) {
-                std::vector<std::string> command_list;
-                uint8_t                  device_type = EMSdevice::device_name_2_device_type(current_arguments[0].c_str());
+                uint8_t device_type = EMSdevice::device_name_2_device_type(current_arguments[0].c_str());
                 if (Command::device_has_commands(device_type)) {
+                    std::vector<std::string> command_list;
                     for (const auto & cf : Command::commands()) {
                         if (cf.device_type_ == device_type) {
                             command_list.emplace_back(cf.cmd_);
diff --git a/src/console.h b/src/console.h
index d5d18ac76..a8e7eeaae 100644
--- a/src/console.h
+++ b/src/console.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/default_settings.h b/src/default_settings.h
index e87815dbb..efabd8972 100644
--- a/src/default_settings.h
+++ b/src/default_settings.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -261,7 +261,7 @@ enum {
 #else
 #define ARDUINO_VERSION_STR(major, minor, patch) "ESP32 Arduino v" STRINGIZE(major) "." STRINGIZE(minor) "." STRINGIZE(patch)
 #endif
-#define ARDUINO_VERSION  ARDUINO_VERSION_STR(ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH)
+#define ARDUINO_VERSION ARDUINO_VERSION_STR(ESP_ARDUINO_VERSION_MAJOR, ESP_ARDUINO_VERSION_MINOR, ESP_ARDUINO_VERSION_PATCH)
 #endif
 
 #endif
diff --git a/src/device_library.h b/src/device_library.h
index 6f7fdd169..29cb20683 100644
--- a/src/device_library.h
+++ b/src/device_library.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -108,7 +108,7 @@
 { 66, DeviceType::THERMOSTAT, "ES72/RC20", DeviceFlags::EMS_DEVICE_FLAG_RC20_N}, // 0x17 or remote
 { 76, DeviceType::THERMOSTAT, "ES73", DeviceFlags::EMS_DEVICE_FLAG_RC30_N}, // 0x10
 {113, DeviceType::THERMOSTAT, "ES72/RC20", DeviceFlags::EMS_DEVICE_FLAG_RC20_N}, // 0x17
-{159, DeviceType::THERMOSTAT, "ES79", DeviceFlags::EMS_DEVICE_FLAG_RC35}, // 0x10
+{156, DeviceType::THERMOSTAT, "ES79", DeviceFlags::EMS_DEVICE_FLAG_RC35}, // 0x10
 
 // Thermostat - Junkers - 0x10
 {105, DeviceType::THERMOSTAT, "FW100", DeviceFlags::EMS_DEVICE_FLAG_JUNKERS},
diff --git a/src/devices/alert.cpp b/src/devices/alert.cpp
index c297192c2..7a4c9adf6 100644
--- a/src/devices/alert.cpp
+++ b/src/devices/alert.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/alert.h b/src/devices/alert.h
index 97d5bc521..896b84d82 100644
--- a/src/devices/alert.h
+++ b/src/devices/alert.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index bf00c5290..b1011bb96 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -482,6 +482,15 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
                               FL_(hpMaxPower),
                               DeviceValueUOM::PERCENT,
                               MAKE_CF_CB(set_hpMaxPower));
+        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
+                              &hpSetDiffPress_,
+                              DeviceValueType::UINT,
+                              DeviceValueNumOp::DV_NUMOP_MUL50,
+                              FL_(hpSetDiffPress),
+                              DeviceValueUOM::MBAR,
+                              MAKE_CF_CB(set_hpDiffPress),
+                              150,
+                              750);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpCompOn_, DeviceValueType::BOOL, FL_(hpCompOn), DeviceValueUOM::NONE);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpActivity_, DeviceValueType::ENUM, FL_(enum_hpactivity), FL_(hpActivity), DeviceValueUOM::NONE);
         // register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpHeatingOn_, DeviceValueType::BOOL, FL_(hpHeatingOn), DeviceValueUOM::NONE);
@@ -1935,6 +1944,10 @@ void Boiler::process_HpMeters(std::shared_ptr<const Telegram> telegram) {
     has_update(telegram, meterHeat_, 24);
 }
 
+void Boiler::process_HpPressure(std::shared_ptr<const Telegram> telegram) {
+    has_update(telegram, hpSetDiffPress_, 9);
+}
+
 // HIU unit
 
 // boiler(0x08) -B-> All(0x00), ?(0x0779), data: 06 05 01 01 AD 02 EF FF FF 00 00 7F FF
@@ -2939,6 +2952,15 @@ bool Boiler::set_hpMaxPower(const char * value, const int8_t id) {
     return false;
 }
 
+bool Boiler::set_hpDiffPress(const char * value, const int8_t id) {
+    int v;
+    if (Helpers::value2number(value, v)) {
+        write_command(0x2CC, 9, (uint8_t)(v / 50), 0x2CC);
+        return true;
+    }
+    return false;
+}
+
 bool Boiler::set_vp_cooling(const char * value, const int8_t id) {
     bool v;
     if (Helpers::value2bool(value, v)) {
diff --git a/src/devices/boiler.h b/src/devices/boiler.h
index 70fa992c0..106764a72 100644
--- a/src/devices/boiler.h
+++ b/src/devices/boiler.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -223,6 +223,7 @@ class Boiler : public EMSdevice {
     uint32_t meterHeat_;
     uint8_t  hpEA0_;
     uint8_t  hpPumpMode_;
+    uint8_t  hpSetDiffPress_;
 
     // Pool unit
     int8_t poolSetTemp_;
@@ -334,6 +335,7 @@ class Boiler : public EMSdevice {
     void process_HpPool(std::shared_ptr<const Telegram> telegram);
     void process_HpInput(std::shared_ptr<const Telegram> telegram);
     void process_HpInConfig(std::shared_ptr<const Telegram> telegram);
+    void process_HpPressure(std::shared_ptr<const Telegram> telegram);
     void process_HpCooling(std::shared_ptr<const Telegram> telegram);
     void process_HpHeaterConfig(std::shared_ptr<const Telegram> telegram);
     void process_HybridHp(std::shared_ptr<const Telegram> telegram);
@@ -437,6 +439,7 @@ class Boiler : public EMSdevice {
     bool set_hpCircPumpWw(const char * value, const int8_t id);
     bool set_hpPumpMode(const char * value, const int8_t id);
     bool set_hpMaxPower(const char * value, const int8_t id);
+    bool set_hpDiffPress(const char * value, const int8_t id);
 
     bool        set_auxLimit(const char * value, const int8_t id);
     inline bool set_auxMaxLimit(const char * value, const int8_t id) {
diff --git a/src/devices/connect.cpp b/src/devices/connect.cpp
index ab442ba6e..db5d578e3 100644
--- a/src/devices/connect.cpp
+++ b/src/devices/connect.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/connect.h b/src/devices/connect.h
index d39e48a14..18b75c40f 100644
--- a/src/devices/connect.h
+++ b/src/devices/connect.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/controller.cpp b/src/devices/controller.cpp
index 9419ff98e..fc133fcab 100644
--- a/src/devices/controller.cpp
+++ b/src/devices/controller.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/controller.h b/src/devices/controller.h
index 7a5de269c..2eac1b9c8 100644
--- a/src/devices/controller.h
+++ b/src/devices/controller.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/extension.cpp b/src/devices/extension.cpp
index 460d80791..153d8dfca 100644
--- a/src/devices/extension.cpp
+++ b/src/devices/extension.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/extension.h b/src/devices/extension.h
index 617456bdc..354326d1b 100644
--- a/src/devices/extension.h
+++ b/src/devices/extension.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/gateway.cpp b/src/devices/gateway.cpp
index 124e5bfed..b5b42d37f 100644
--- a/src/devices/gateway.cpp
+++ b/src/devices/gateway.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/gateway.h b/src/devices/gateway.h
index c20252727..55812fc97 100644
--- a/src/devices/gateway.h
+++ b/src/devices/gateway.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/generic.cpp b/src/devices/generic.cpp
index d93543d12..1ae9b90d2 100644
--- a/src/devices/generic.cpp
+++ b/src/devices/generic.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/generic.h b/src/devices/generic.h
index e1a662cac..e5e11c7f2 100644
--- a/src/devices/generic.h
+++ b/src/devices/generic.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/heatpump.cpp b/src/devices/heatpump.cpp
index 8a1c214b6..065884496 100644
--- a/src/devices/heatpump.cpp
+++ b/src/devices/heatpump.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/heatpump.h b/src/devices/heatpump.h
index cb0fbcab1..5512e2b77 100644
--- a/src/devices/heatpump.h
+++ b/src/devices/heatpump.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/heatsource.cpp b/src/devices/heatsource.cpp
index 2e4c6fbdd..031a5b681 100644
--- a/src/devices/heatsource.cpp
+++ b/src/devices/heatsource.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/heatsource.h b/src/devices/heatsource.h
index 7fbd4f8df..eb0b523b7 100644
--- a/src/devices/heatsource.h
+++ b/src/devices/heatsource.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/mixer.cpp b/src/devices/mixer.cpp
index 836036753..5d25e0664 100644
--- a/src/devices/mixer.cpp
+++ b/src/devices/mixer.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,12 +30,24 @@ Mixer::Mixer(uint8_t device_type, uint8_t device_id, uint8_t product_id, const c
     if (flags == EMSdevice::EMS_DEVICE_FLAG_MMPLUS) {
         register_telegram_type(device_id - 0x20 + 0x02D7, "MMPLUSStatusMessage_HC", false, MAKE_PF_CB(process_MMPLUSStatusMessage_HC));
         // register_telegram_type(device_id - 0x20 + 0x02E1, "MMPLUSSetMessage_HC", true, MAKE_PF_CB(process_MMPLUSSetMessage_HC));
+        register_telegram_type((device_id - 0x20) * 2 + 0x02CC, "MMPLUSSetMessage_HC", false, MAKE_PF_CB(process_MMPLUSSetMessage_HC));
         hc_         = device_id - 0x20 + 1;
         uint8_t tag = DeviceValueTAG::TAG_HC1 + hc_ - 1;
         register_device_value(tag, &flowTempHc_, DeviceValueType::USHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(flowTempHc), DeviceValueUOM::DEGREES);
         register_device_value(tag, &status_, DeviceValueType::UINT, FL_(mixerStatus), DeviceValueUOM::PERCENT);
         register_device_value(tag, &flowSetTemp_, DeviceValueType::UINT, FL_(flowSetTemp), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_flowSetTemp));
         register_device_value(tag, &pumpStatus_, DeviceValueType::BOOL, FL_(pumpStatus), DeviceValueUOM::NONE, MAKE_CF_CB(set_pump));
+        register_device_value(tag, &activated_, DeviceValueType::BOOL, FL_(activated), DeviceValueUOM::NONE, MAKE_CF_CB(set_activated));
+        register_device_value(tag,
+                              &setValveTime_,
+                              DeviceValueType::UINT,
+                              DeviceValueNumOp::DV_NUMOP_MUL10,
+                              FL_(mixerSetTime),
+                              DeviceValueUOM::SECONDS,
+                              MAKE_CF_CB(set_setValveTime),
+                              10,
+                              600);
+        register_device_value(tag, &flowTempOffset_, DeviceValueType::UINT, FL_(flowtempoffset), DeviceValueUOM::K, MAKE_CF_CB(set_flowTempOffset), 0, 20);
     }
 
     // EMS 1.0
@@ -139,6 +151,12 @@ void Mixer::process_MMConfigMessage(std::shared_ptr<const Telegram> telegram) {
     has_update(telegram, setValveTime_, 1); // valve runtime in 10 sec, max 120 s
 }
 
+// Mixer Setting 0x2CC
+void Mixer::process_MMPLUSSetMessage_HC(std::shared_ptr<const Telegram> telegram) {
+    has_update(telegram, activated_, 0);      // on = 0xFF
+    has_update(telegram, setValveTime_, 1);   // valve runtime in 10 sec, max 120 s
+    has_update(telegram, flowTempOffset_, 2); // Mixer increase [0-20 K]
+}
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wunused-parameter"
@@ -146,10 +164,10 @@ void Mixer::process_MMConfigMessage(std::shared_ptr<const Telegram> telegram) {
 // Thermostat(0x10) -> Mixer(0x20), ?(0x2E1), data: 01 1C 64 00 01
 // Thermostat(0x10) -> Mixing Module(0x20), (0x2E1), data: 01 00 00 00 01
 // Thermostat(0x10) -> Mixing Module(0x20), (0x2EB), data: 00
-void Mixer::process_MMPLUSSetMessage_HC(std::shared_ptr<const Telegram> telegram) {
-    // pos 1: setpoint
-    // pos2: pump
-}
+// void Mixer::process_MMPLUSSetMessage_HC(std::shared_ptr<const Telegram> telegram) {
+// pos 1: setpoint
+// pos2: pump
+// }
 
 // Mixer on a MM10 - 0xAC
 // e.g. Thermostat -> Mixer Module, type 0xAC, telegram: 10 21 AC 00 1E 64 01 AB
@@ -221,6 +239,11 @@ bool Mixer::set_activated(const char * value, const int8_t id) {
         write_command(0xAA, 0, b ? 0xFF : 0, 0xAA);
         return true;
     }
+    if (flags() == EMSdevice::EMS_DEVICE_FLAG_MMPLUS) {
+        uint8_t hc = device_id() - 0x20;
+        write_command(0x2CC + hc * 2, 0, b ? 0xFF : 0, 0x2CC + hc * 2);
+        return true;
+    }
     return false;
 }
 
@@ -234,6 +257,25 @@ bool Mixer::set_setValveTime(const char * value, const int8_t id) {
         write_command(0xAA, 1, v, 0xAA);
         return true;
     }
+    if (flags() == EMSdevice::EMS_DEVICE_FLAG_MMPLUS) {
+        v          = (v + 5) / 10;
+        uint8_t hc = device_id() - 0x20;
+        write_command(0x2CC + hc * 2, 1, v, 0x2CC + hc * 2);
+        return true;
+    }
+    return false;
+}
+
+bool Mixer::set_flowTempOffset(const char * value, const int8_t id) {
+    int v;
+    if (!Helpers::value2number(value, v)) {
+        return false;
+    }
+    if (flags() == EMSdevice::EMS_DEVICE_FLAG_MMPLUS) {
+        uint8_t hc = device_id() - 0x20;
+        write_command(0x2CC + hc * 2, 2, v, 0x2CC + hc * 2);
+        return true;
+    }
     return false;
 }
 
diff --git a/src/devices/mixer.h b/src/devices/mixer.h
index cb19c9d7b..984d8ebe0 100644
--- a/src/devices/mixer.h
+++ b/src/devices/mixer.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,6 +43,7 @@ class Mixer : public EMSdevice {
     bool set_pump(const char * value, const int8_t id);
     bool set_activated(const char * value, const int8_t id);
     bool set_setValveTime(const char * value, const int8_t id);
+    bool set_flowTempOffset(const char * value, const int8_t id);
 
   private:
     uint16_t flowTempHc_;
@@ -52,6 +53,7 @@ class Mixer : public EMSdevice {
     uint8_t  flowSetTemp_;
     uint8_t  activated_;
     uint8_t  setValveTime_;
+    uint8_t  flowTempOffset_;
 
     uint16_t hc_               = EMS_VALUE_USHORT_NOTSET;
 };
diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp
index cf196cd1f..32d3516a8 100644
--- a/src/devices/solar.cpp
+++ b/src/devices/solar.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/solar.h b/src/devices/solar.h
index ef69095d1..4cf1945f8 100644
--- a/src/devices/solar.h
+++ b/src/devices/solar.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/switch.cpp b/src/devices/switch.cpp
index b9d0d1932..842fab89a 100644
--- a/src/devices/switch.cpp
+++ b/src/devices/switch.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/switch.h b/src/devices/switch.h
index ddcd6f2cc..fb8ba01e8 100644
--- a/src/devices/switch.h
+++ b/src/devices/switch.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
index 220ae3654..f6ec4404b 100644
--- a/src/devices/thermostat.cpp
+++ b/src/devices/thermostat.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,15 +33,15 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i
     }
     // remote thermostats with humidity: RC100H remote, each thermostat is for one hc
     if (device_id >= 0x38 && device_id <= 0x3F) {
-        // reserve_telegram_functions(3);
         register_telegram_type(0x042B + device_id - 0x38, "RemoteTemp", false, MAKE_PF_CB(process_RemoteTemp));
-        register_telegram_type(0x047B + device_id - 0x38, "RemoteHumidity", false, MAKE_PF_CB(process_RemoteHumidity));
-        register_telegram_type(0x0273 + device_id - 0x38, "RemoteCorrection", true, MAKE_PF_CB(process_RemoteCorrection));
-        register_telegram_type(0x0A6A + device_id - 0x38, "RemoteBattery", true, MAKE_PF_CB(process_RemoteBattery));
-        // maybe fixed type for these telegrams?
-        // register_telegram_type(0x0273, "RemoteCorrection", true, MAKE_PF_CB(process_RemoteCorrection));
-        // register_telegram_type(0x0A6B, "RemoteBattery", true, MAKE_PF_CB(process_RemoteBattery));
-
+        if (product_id != Roomctrl::RC200) {
+            register_telegram_type(0x047B + device_id - 0x38, "RemoteHumidity", false, MAKE_PF_CB(process_RemoteHumidity));
+            register_telegram_type(0x0273 + device_id - 0x38, "RemoteCorrection", true, MAKE_PF_CB(process_RemoteCorrection));
+            register_telegram_type(0x0A6A + device_id - 0x38, "RemoteBattery", true, MAKE_PF_CB(process_RemoteBattery));
+            // maybe fixed type for these telegrams?
+            // register_telegram_type(0x0273, "RemoteCorrection", true, MAKE_PF_CB(process_RemoteCorrection));
+            // register_telegram_type(0x0A6B, "RemoteBattery", true, MAKE_PF_CB(process_RemoteBattery));
+        }
         register_device_values(); // register device values for common values (not heating circuit)
         return;                   // no values to add
     }
@@ -1166,7 +1166,7 @@ void Thermostat::process_RC300WWmode(std::shared_ptr<const Telegram> telegram) {
     }
     has_update(telegram, wwCircMode_, 3);        // 0=off, 1=on, 2=auto, 4=own?
     has_update(telegram, wwChargeDuration_, 10); // value in steps of 15 min
-    has_update(telegram, wwCharge_, 11);         // boolv0xFF on
+    has_update(telegram, wwCharge_, 11);         // bool 0xFF on
     has_update(telegram, wwDisinfecting_, 5);    // 0-off, 0xFF on
     has_update(telegram, wwDisinfectHour_, 6);   // value in steps of 15 min
     has_update(telegram, wwDisinfectDay_, 7);    // 0-6 Day of week, 7 every day
@@ -1810,7 +1810,11 @@ bool Thermostat::set_remotetemp(const char * value, const int8_t id) {
     } else if (model() == EMSdevice::EMS_DEVICE_FLAG_RC35 || model() == EMSdevice::EMS_DEVICE_FLAG_RC30_N) {
         Roomctrl::set_remotetemp(Roomctrl::RC20, hc->hc(), hc->remotetemp); // RC20
     } else if ((model() == EMSdevice::EMS_DEVICE_FLAG_BC400) || model() == EMSdevice::EMS_DEVICE_FLAG_RC300) {
-        Roomctrl::set_remotetemp(Roomctrl::RC100H, hc->hc(), hc->remotetemp); // RC100H
+        if (hc->control == 1) {
+            Roomctrl::set_remotetemp(Roomctrl::RC200, hc->hc(), hc->remotetemp); // RC200
+        } else {
+            Roomctrl::set_remotetemp(Roomctrl::RC100H, hc->hc(), hc->remotetemp); // RC100H
+        }
     }
 
     return true;
@@ -1834,7 +1838,7 @@ bool Thermostat::set_remotehum(const char * value, const int8_t id) {
         hc->remotehum = h;
     }
 
-    if ((model() == EMSdevice::EMS_DEVICE_FLAG_BC400) || model() == EMSdevice::EMS_DEVICE_FLAG_RC300) {
+    if (hc->control == 3 && (model() == EMSdevice::EMS_DEVICE_FLAG_BC400 || model() == EMSdevice::EMS_DEVICE_FLAG_RC300)) {
         Roomctrl::set_remotehum(Roomctrl::RC100H, hc->hc(), hc->remotehum); // RC100H
         return true;
     }
@@ -2933,8 +2937,8 @@ bool Thermostat::set_switchtime(const char * value, const uint16_t type_id, char
     uint8_t time = 0x91; // invalid
 
     if (value[0] == '{') {
-        StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc;
-        DeserializationError                       error = deserializeJson(doc, value);
+        JsonDocument         doc;
+        DeserializationError error = deserializeJson(doc, value);
         if (error) {
             return false;
         }
diff --git a/src/devices/thermostat.h b/src/devices/thermostat.h
index 9af078913..8b43ee61a 100644
--- a/src/devices/thermostat.h
+++ b/src/devices/thermostat.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/ventilation.cpp b/src/devices/ventilation.cpp
index 8d85895f5..8b815c34b 100644
--- a/src/devices/ventilation.cpp
+++ b/src/devices/ventilation.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/devices/ventilation.h b/src/devices/ventilation.h
index 336b6193c..4587f195f 100644
--- a/src/devices/ventilation.h
+++ b/src/devices/ventilation.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index 11b145e83..f492d0593 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -380,7 +380,7 @@ bool EMSdevice::has_cmd(const char * cmd, const int8_t id) const {
 
 // list of registered device entries
 // called from the command 'entities'
-void EMSdevice::list_device_entries(JsonObject & output) const {
+void EMSdevice::list_device_entries(JsonObject output) const {
     for (const auto & dv : devicevalues_) {
         auto fullname = dv.get_fullname();
         if (!dv.has_state(DeviceValueState::DV_WEB_EXCLUDE) && dv.type != DeviceValueType::CMD && !fullname.empty()) {
@@ -393,7 +393,7 @@ void EMSdevice::list_device_entries(JsonObject & output) const {
                 snprintf(key, sizeof(key), "%s", dv.short_name);
             }
 
-            JsonArray details = output.createNestedArray(key);
+            JsonArray details = output[key].to<JsonArray>();
 
             // add the full name description
             details.add(fullname);
@@ -583,6 +583,7 @@ void EMSdevice::add_device_value(uint8_t               tag,              // to b
             }
         }
     });
+
     if (ignore) {
         return;
     }
@@ -841,7 +842,7 @@ std::string EMSdevice::get_value_uom(const std::string & shortname) const {
     return std::string{}; // not found
 }
 
-bool EMSdevice::export_values(uint8_t device_type, JsonObject & output, const int8_t id, const uint8_t output_target) {
+bool EMSdevice::export_values(uint8_t device_type, JsonObject output, const int8_t id, const uint8_t output_target) {
     bool    has_value = false;
     uint8_t tag;
     if (id >= 1 && id <= (1 + DeviceValueTAG::TAG_HS16 - DeviceValueTAG::TAG_HC1)) {
@@ -868,7 +869,7 @@ bool EMSdevice::export_values(uint8_t device_type, JsonObject & output, const in
         for (const auto & emsdevice : EMSESP::emsdevices) {
             if (emsdevice && (emsdevice->device_type() == device_type)) {
                 if (!nest_created && emsdevice->has_tags(tag)) {
-                    output_hc    = output.createNestedObject(EMSdevice::tag_to_mqtt(tag));
+                    output_hc    = output[EMSdevice::tag_to_mqtt(tag)].to<JsonObject>();
                     nest_created = true;
                 }
                 has_value |= emsdevice->generate_values(output_hc, tag, true, output_target); // use nested for id -1 and 0
@@ -882,10 +883,10 @@ bool EMSdevice::export_values(uint8_t device_type, JsonObject & output, const in
 // this is loosely based of the function generate_values used for the MQTT and Console
 // except additional data is stored in the JSON document needed for the Web UI like the UOM and command
 // v=value, u=uom, n=name, c=cmd, h=help string, s=step, m=min, x=max
-void EMSdevice::generate_values_web(JsonObject & output) {
+void EMSdevice::generate_values_web(JsonObject output) {
     // output["label"] = to_string_short();
     // output["label"] = name_;
-    JsonArray data = output.createNestedArray("data");
+    JsonArray data = output["data"].to<JsonArray>();
 
     for (auto & dv : devicevalues_) {
         auto fullname = dv.get_fullname();
@@ -895,7 +896,7 @@ void EMSdevice::generate_values_web(JsonObject & output) {
         //  2. it must have a valid value, if it is not a command like 'reset'
         //  3. show favorites first
         if (!dv.has_state(DeviceValueState::DV_WEB_EXCLUDE) && !fullname.empty() && (dv.hasValue() || (dv.type == DeviceValueType::CMD))) {
-            JsonObject obj        = data.createNestedObject(); // create the object, we know there is a value
+            JsonObject obj        = data.add<JsonObject>(); // create the object, we know there is a value
             uint8_t    fahrenheit = 0;
 
             // handle Booleans (true, false), output as strings according to the user settings
@@ -943,11 +944,10 @@ void EMSdevice::generate_values_web(JsonObject & output) {
             auto mask = Helpers::hextoa((uint8_t)(dv.state >> 4), false); // create mask to a 2-char string
 
             // add name, prefixing the tag if it exists. This is the id used in the WebUI table and must be unique
-            if (dv.has_tag()) {
-                obj["id"] = mask + tag_to_string(dv.tag) + " " + fullname;
-            } else {
-                obj["id"] = mask + fullname;
-            }
+            obj["id"] = dv.has_tag() ? mask + tag_to_string(dv.tag) + " " + fullname : mask + fullname; // suffix tag
+
+            // TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
+            // obj["id"] = dv.has_tag() ? mask + fullname + " " + tag_to_string(dv.tag) : mask + fullname; // suffix tag
 
             // add commands and options
             if (dv.has_cmd && !dv.has_state(DeviceValueState::DV_READONLY)) {
@@ -962,7 +962,7 @@ void EMSdevice::generate_values_web(JsonObject & output) {
 
                 // add the Command options
                 if (dv.type == DeviceValueType::ENUM || (dv.type == DeviceValueType::CMD && dv.options_size > 1)) {
-                    JsonArray l = obj.createNestedArray("l");
+                    JsonArray l = obj["l"].to<JsonArray>();
                     for (uint8_t i = 0; i < dv.options_size; i++) {
                         auto enum_str = Helpers::translated_word(dv.options[i]);
                         if (enum_str) {
@@ -970,7 +970,7 @@ void EMSdevice::generate_values_web(JsonObject & output) {
                         }
                     }
                 } else if (dv.type == DeviceValueType::BOOL) {
-                    JsonArray l = obj.createNestedArray("l");
+                    JsonArray l = obj["l"].to<JsonArray>();
                     char      result[12];
                     l.add(Helpers::render_boolean(result, false, true));
                     l.add(Helpers::render_boolean(result, true, true));
@@ -1001,10 +1001,10 @@ void EMSdevice::generate_values_web(JsonObject & output) {
 
 // as generate_values_web() but stripped down to only show all entities and their state
 // this is used only for WebCustomizationService::device_entities()
-void EMSdevice::generate_values_web_customization(JsonArray & output) {
+void EMSdevice::generate_values_web_customization(JsonArray output) {
     for (auto & dv : devicevalues_) {
         // also show commands and entities that have an empty full name
-        JsonObject obj        = output.createNestedObject();
+        JsonObject obj        = output.add<JsonObject>();
         uint8_t    fahrenheit = !EMSESP::system_.fahrenheit() ? 0 : (dv.uom == DeviceValueUOM::DEGREES) ? 2 : (dv.uom == DeviceValueUOM::DEGREES_R) ? 1 : 0;
 
         // create the value
@@ -1058,13 +1058,10 @@ void EMSdevice::generate_values_web_customization(JsonArray & output) {
         auto fullname = Helpers::translated_word(dv.fullname);
         if (dv.type != DeviceValueType::CMD) {
             if (fullname) {
-                if (dv.has_tag()) {
-                    char name[50];
-                    snprintf(name, sizeof(name), "%s %s", tag_to_string(dv.tag), fullname);
-                    obj["n"] = name;
-                } else {
-                    obj["n"] = fullname;
-                }
+                obj["n"] = dv.has_tag() ? std::string(tag_to_string(dv.tag)) + " " + fullname : fullname; // prefix tag
+
+                // TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
+                // obj["n"] = (dv.has_tag()) ? fullname + " " + tag_to_string(dv.tag) : fullname; // suffix tag
             }
 
             // add the custom name, is optional
@@ -1096,7 +1093,7 @@ void EMSdevice::generate_values_web_customization(JsonArray & output) {
                 for (std::string entity_id : entityCustomization.entity_ids) {
                     uint8_t mask = Helpers::hextoint(entity_id.substr(0, 2).c_str());
                     if (mask & 0x80) {
-                        JsonObject obj = output.createNestedObject();
+                        JsonObject obj = output.add<JsonObject>();
                         obj["id"]      = DeviceValue::get_name(entity_id);
                         obj["m"]       = mask;
                         obj["w"]       = false;
@@ -1376,7 +1373,7 @@ void EMSdevice::dump_value_info() {
 // builds json for a specific device value / entity
 // cmd is the endpoint or name of the device entity
 // returns false if failed, otherwise true
-bool EMSdevice::get_value_info(JsonObject & output, const char * cmd, const int8_t id) {
+bool EMSdevice::get_value_info(JsonObject output, const char * cmd, const int8_t id) {
     JsonObject json = output;
     int8_t     tag  = id;
 
@@ -1409,13 +1406,10 @@ bool EMSdevice::get_value_info(JsonObject & output, const char * cmd, const int8
 
             auto fullname = dv.get_fullname();
             if (!fullname.empty()) {
-                if (dv.has_tag()) {
-                    char name[50];
-                    snprintf(name, sizeof(name), "%s %s", tag_to_string(dv.tag), fullname.c_str());
-                    json["fullname"] = name;
-                } else {
-                    json["fullname"] = fullname;
-                }
+                json["fullname"] = dv.has_tag() ? fullname + " " + tag_to_string(dv.tag) : fullname; // suffix tag
+
+                // TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
+                json["fullname"] = dv.has_tag() ? std::string(tag_to_string(dv.tag)) + " " + fullname.c_str() : fullname; // prefix tag
             }
 
             if (dv.tag != DeviceValueTAG::TAG_NONE) {
@@ -1433,7 +1427,7 @@ bool EMSdevice::get_value_info(JsonObject & output, const char * cmd, const int8
                     }
                 }
                 json[type]      = F_(enum);
-                JsonArray enum_ = json.createNestedArray(F_(enum));
+                JsonArray enum_ = json[F_(enum)].to<JsonArray>();
                 for (uint8_t i = 0; i < dv.options_size; i++) {
                     enum_.add(Helpers::translated_word(dv.options[i]));
                 }
@@ -1507,7 +1501,7 @@ bool EMSdevice::get_value_info(JsonObject & output, const char * cmd, const int8
             case DeviceValueType::CMD:
                 json[type] = F_(command);
                 if (dv.options_size > 1) {
-                    JsonArray enum_ = json.createNestedArray(F_(enum));
+                    JsonArray enum_ = json[F_(enum)].to<JsonArray>();
                     for (uint8_t i = 0; i < dv.options_size; i++) {
                         enum_.add(Helpers::translated_word(dv.options[i]));
                     }
@@ -1549,7 +1543,7 @@ bool EMSdevice::get_value_info(JsonObject & output, const char * cmd, const int8
                 EMSESP::logger().debug("Attribute '%s'", attribute_s);
 #endif
                 if (json.containsKey(attribute_s)) {
-                    JsonVariant data = json[attribute_s];
+                    String data = json[attribute_s].as<String>();
                     output.clear();
                     output["api_data"] = data;
                     return true;
@@ -1582,7 +1576,7 @@ void EMSdevice::publish_all_values() {
 // For each value in the device create the json object pair and add it to given json
 // return false if empty
 // this is used to create the MQTT payloads, Console messages and Web API calls
-bool EMSdevice::generate_values(JsonObject & output, const uint8_t tag_filter, const bool nested, const uint8_t output_target) {
+bool EMSdevice::generate_values(JsonObject output, const uint8_t tag_filter, const bool nested, const uint8_t output_target) {
     bool       has_values = false; // to see if we've added a value. it's faster than doing a json.size() at the end
     uint8_t    old_tag    = 255;   // NAN
     JsonObject json       = output;
@@ -1610,16 +1604,20 @@ bool EMSdevice::generate_values(JsonObject & output, const uint8_t tag_filter, c
             char name[80];
 
             if (output_target == OUTPUT_TARGET::API_VERBOSE || output_target == OUTPUT_TARGET::CONSOLE) {
-                char short_name[20];
-                if (output_target == OUTPUT_TARGET::CONSOLE) {
-                    snprintf(short_name, sizeof(short_name), " (%s)", dv.short_name);
-                } else {
-                    strcpy(short_name, "");
-                }
+                // char short_name[20];
+                // if (output_target == OUTPUT_TARGET::CONSOLE) {
+                //     snprintf(short_name, sizeof(short_name), "(%s)", dv.short_name);
+                // } else {
+                //     strcpy(short_name, "");
+                // }
+
+                // add tag
                 if (have_tag) {
-                    snprintf(name, sizeof(name), "%s %s%s", tag_to_string(dv.tag), fullname.c_str(), short_name); // prefix the tag
+                    snprintf(name, sizeof(name), "%s %s (%s)", tag_to_string(dv.tag), fullname.c_str(), dv.short_name); // prefix tag
+                    // TODO check TAG https://github.com/emsesp/EMS-ESP32/issues/1338
+                    // snprintf(name, sizeof(name), "%s %s (%s)", fullname.c_str(), tag_to_string(dv.tag), dv.short_name); // sufix tag
                 } else {
-                    snprintf(name, sizeof(name), "%s%s", fullname.c_str(), short_name);
+                    snprintf(name, sizeof(name), "%s (%s)", fullname.c_str(), dv.short_name);
                 }
             } else {
                 strlcpy(name, (dv.short_name), sizeof(name)); // use short name
@@ -1628,15 +1626,19 @@ bool EMSdevice::generate_values(JsonObject & output, const uint8_t tag_filter, c
                 if (dv.tag != old_tag) {
                     old_tag = dv.tag;
                     if (nested && have_tag && dv.tag >= DeviceValueTAG::TAG_HC1) {
-                        json = output.createNestedObject(tag_to_mqtt(dv.tag));
+                        json = output[tag_to_mqtt(dv.tag)].to<JsonObject>();
                     }
                 }
             }
+
             // do not overwrite
             if (json.containsKey(name)) {
+#ifdef EMSESP_DEBUG
                 EMSESP::logger().debug("double json key: %s", name);
+#endif
                 continue;
             }
+
             // handle Booleans
             if (dv.type == DeviceValueType::BOOL && Helpers::hasValue(*(uint8_t *)(dv.value_p), EMS_VALUE_BOOL)) {
                 // see how to render the value depending on the setting
diff --git a/src/emsdevice.h b/src/emsdevice.h
index ff284ade9..3e881cff5 100644
--- a/src/emsdevice.h
+++ b/src/emsdevice.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,7 +51,7 @@ class EMSdevice {
     static const char * uom_to_string(uint8_t uom);
     static const char * tag_to_mqtt(uint8_t tag);
     static uint8_t      decode_brand(uint8_t value);
-    static bool         export_values(uint8_t device_type, JsonObject & output, const int8_t id, const uint8_t output_target);
+    static bool         export_values(uint8_t device_type, JsonObject output, const int8_t id, const uint8_t output_target);
 
     // non static
 
@@ -204,7 +204,7 @@ class EMSdevice {
     void   show_telegram_handlers(uuid::console::Shell & shell) const;
     char * show_telegram_handlers(char * result, const size_t len, const uint8_t handlers);
     void   show_mqtt_handlers(uuid::console::Shell & shell) const;
-    void   list_device_entries(JsonObject & output) const;
+    void   list_device_entries(JsonObject output) const;
     void   add_handlers_ignored(const uint16_t handler);
 
     void set_climate_minmax(uint8_t tag, int16_t min, uint32_t max);
@@ -216,13 +216,13 @@ class EMSdevice {
 
     std::string get_value_uom(const std::string & shortname) const;
 
-    bool get_value_info(JsonObject & root, const char * cmd, const int8_t id);
-    void get_dv_info(JsonObject & json);
+    bool get_value_info(JsonObject root, const char * cmd, const int8_t id);
+    void get_dv_info(JsonObject json);
 
     enum OUTPUT_TARGET : uint8_t { API_VERBOSE, API_SHORTNAMES, MQTT, CONSOLE };
-    bool generate_values(JsonObject & output, const uint8_t tag_filter, const bool nested, const uint8_t output_target);
-    void generate_values_web(JsonObject & output);
-    void generate_values_web_customization(JsonArray & output);
+    bool generate_values(JsonObject output, const uint8_t tag_filter, const bool nested, const uint8_t output_target);
+    void generate_values_web(JsonObject output);
+    void generate_values_web_customization(JsonArray output);
 
     void add_device_value(uint8_t               tag,
                           void *                value_p,
diff --git a/src/emsdevicevalue.cpp b/src/emsdevicevalue.cpp
index 8330b7b9b..867811c34 100644
--- a/src/emsdevicevalue.cpp
+++ b/src/emsdevicevalue.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -110,7 +110,7 @@ const char * DeviceValue::DeviceValueUOM_s[] = {
     F_(uom_blank), // 0
     F_(uom_degrees), F_(uom_degrees), F_(uom_percent), F_(uom_lmin), F_(uom_kwh),     F_(uom_wh),   FL_(hours)[0],      FL_(minutes)[0], F_(uom_ua),
     F_(uom_bar),     F_(uom_kw),      F_(uom_w),       F_(uom_kb),   FL_(seconds)[0], F_(uom_dbm),  F_(uom_fahrenheit), F_(uom_mv),      F_(uom_sqm),
-    F_(uom_m3),      F_(uom_l),       F_(uom_kmin),    F_(uom_k),    F_(uom_volts),   F_(uom_blank)
+    F_(uom_m3),      F_(uom_l),       F_(uom_kmin),    F_(uom_k),    F_(uom_volts),   F_(uom_mbar), F_(uom_blank)
 
 };
 
diff --git a/src/emsdevicevalue.h b/src/emsdevicevalue.h
index eae5375f6..f7f458b28 100644
--- a/src/emsdevicevalue.h
+++ b/src/emsdevicevalue.h
@@ -1,7 +1,7 @@
 
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,7 +71,8 @@ class DeviceValue {
         KMIN,        // 21 - K*min
         K,           // 22 - K
         VOLTS,       // 23 - V
-        CONNECTIVITY // 24 - used in HA
+        MBAR,        // 24 - mbar
+        CONNECTIVITY // 25 - used in HA
     };
 
     // TAG mapping - maps to DeviceValueTAG_s in emsdevice.cpp
@@ -143,7 +144,8 @@ class DeviceValue {
         DV_NUMOP_DIV100 = 100,
         DV_NUMOP_MUL5   = -5,
         DV_NUMOP_MUL10  = -10,
-        DV_NUMOP_MUL15  = -15
+        DV_NUMOP_MUL15  = -15,
+        DV_NUMOP_MUL50  = -50
     };
 
     uint8_t               device_type;    // EMSdevice::DeviceType
diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index c60448020..f8005c79a 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -380,8 +380,8 @@ void EMSESP::show_device_values(uuid::console::Shell & shell) {
                 // print header, with device type translated
                 shell.printfln("%s: %s (%d)", emsdevice->device_type_2_device_name_translated(), emsdevice->to_string().c_str(), emsdevice->count_entities());
 
-                DynamicJsonDocument doc(EMSESP_JSON_SIZE_XXXLARGE); // use max size
-                JsonObject          json = doc.to<JsonObject>();
+                JsonDocument doc;
+                JsonObject   json = doc.to<JsonObject>();
 
                 emsdevice->generate_values(json, DeviceValueTAG::TAG_NONE, true, EMSdevice::OUTPUT_TARGET::CONSOLE);
 
@@ -392,7 +392,6 @@ void EMSESP::show_device_values(uuid::console::Shell & shell) {
                     // extract the shortname from the key, which is in brackets
                     std::size_t first_bracket = key.find_last_of('(');
                     std::size_t last_bracket  = key.find_last_of(')');
-                    std::string shortname     = key.substr(first_bracket + 1, last_bracket - first_bracket - 1);
                     std::string uom           = emsdevice->get_value_uom(key.substr(first_bracket + 1, last_bracket - first_bracket - 1));
 
                     shell.printfln("  %s: %s%s %s%s", key.c_str(), COLOR_BRIGHT_GREEN, p.value().as<std::string>().c_str(), uom.c_str(), COLOR_RESET);
@@ -405,8 +404,8 @@ void EMSESP::show_device_values(uuid::console::Shell & shell) {
     // show any custom entities
     if (webCustomEntityService.count_entities() > 0) {
         shell.printfln("Custom entities:");
-        StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> custom_doc; // use max size
-        JsonObject                                  custom_output = custom_doc.to<JsonObject>();
+        JsonDocument custom_doc; // use max size
+        JsonObject   custom_output = custom_doc.to<JsonObject>();
         webCustomEntityService.show_values(custom_output);
         for (JsonPair p : custom_output) {
             shell.printfln("  %s: %s%s%s", p.key().c_str(), COLOR_BRIGHT_GREEN, p.value().as<std::string>().c_str(), COLOR_RESET);
@@ -464,7 +463,7 @@ void EMSESP::show_sensor_values(uuid::console::Shell & shell) {
                                COLOR_BRIGHT_GREEN,
                                (uint16_t)sensor.value(), // as int
                                COLOR_RESET,
-                               sensor.type() == AnalogSensor::AnalogType::COUNTER ? "Counter" : "Digital in");
+                               sensor.type() == AnalogSensor::AnalogType::COUNTER ? "Counter" : "Digital In");
                 break;
             }
         }
@@ -557,22 +556,22 @@ void EMSESP::reset_mqtt_ha() {
 // this will also create the HA /config topic for each device value
 // generate_values_json is called to build the device value (dv) object array
 void EMSESP::publish_device_values(uint8_t device_type) {
-    DynamicJsonDocument doc(EMSESP_JSON_SIZE_XXLARGE);
-    JsonObject          json         = doc.to<JsonObject>();
-    bool                need_publish = false;
-    bool                nested       = (Mqtt::is_nested());
+    JsonDocument doc;
+    JsonObject   json         = doc.to<JsonObject>();
+    bool         need_publish = false;
+    bool         nested       = (Mqtt::is_nested());
 
     // group by device type
     for (uint8_t tag = DeviceValueTAG::TAG_BOILER_DATA_WW; tag <= DeviceValueTAG::TAG_HS16; tag++) {
-        JsonObject json_hc      = json;
+        JsonObject json_tag     = json;
         bool       nest_created = false;
         for (const auto & emsdevice : emsdevices) {
             if (emsdevice && (emsdevice->device_type() == device_type)) {
                 if (nested && !nest_created && emsdevice->has_tags(tag)) {
-                    json_hc      = doc.createNestedObject(EMSdevice::tag_to_mqtt(tag));
+                    json_tag     = doc[EMSdevice::tag_to_mqtt(tag)].to<JsonObject>();
                     nest_created = true;
                 }
-                need_publish |= emsdevice->generate_values(json_hc, tag, false, EMSdevice::OUTPUT_TARGET::MQTT);
+                need_publish |= emsdevice->generate_values(json_tag, tag, false, EMSdevice::OUTPUT_TARGET::MQTT);
             }
         }
         if (need_publish && ((!nested && tag >= DeviceValueTAG::TAG_DEVICE_DATA_WW) || (tag == DeviceValueTAG::TAG_BOILER_DATA_WW))) {
@@ -645,8 +644,8 @@ void EMSESP::publish_response(std::shared_ptr<const Telegram> telegram) {
         strlcat(buffer, " ", 768);
         return;
     }
-    DynamicJsonDocument doc(EMSESP_JSON_SIZE_LARGE);
-    char                s[10];
+    JsonDocument doc;
+    char         s[10];
     doc["src"]    = Helpers::hextoa(s, telegram->src);
     doc["dest"]   = Helpers::hextoa(s, telegram->dest);
     doc["type"]   = Helpers::hextoa(s, telegram->type_id);
@@ -667,7 +666,7 @@ void EMSESP::publish_response(std::shared_ptr<const Telegram> telegram) {
 
 // builds json with the detail of each value,
 // for a specific EMS device type or the sensors, scheduler and custom entities
-bool EMSESP::get_device_value_info(JsonObject & root, const char * cmd, const int8_t id, const uint8_t devicetype) {
+bool EMSESP::get_device_value_info(JsonObject root, const char * cmd, const int8_t id, const uint8_t devicetype) {
     for (const auto & emsdevice : emsdevices) {
         if (emsdevice->device_type() == devicetype) {
             if (emsdevice->get_value_info(root, cmd, id)) {
@@ -705,7 +704,7 @@ bool EMSESP::get_device_value_info(JsonObject & root, const char * cmd, const in
 
 // search for recognized device_ids : Me, All, otherwise print hex value
 std::string EMSESP::device_tostring(const uint8_t device_id) {
-    if ((device_id & 0x7F) == rxservice_.ems_bus_id()) {
+    if ((device_id & 0x7F) == EMSbus::ems_bus_id()) {
         return "Me";
     } else if (device_id == 0x00) {
         return "All";
@@ -734,9 +733,13 @@ std::string EMSESP::pretty_telegram(std::shared_ptr<const Telegram> telegram) {
             } else if (emsdevice->is_device_id(dest)) {
                 dest_name = emsdevice->device_type_name();
             }
-            // get the type name, any match will do
+            // get the type name
             if (type_name.empty()) {
-                type_name = emsdevice->telegram_type_name(telegram);
+                if ((telegram->operation == Telegram::Operation::RX_READ && emsdevice->is_device_id(dest))
+                    || (telegram->operation != Telegram::Operation::RX_READ && dest == 0 && emsdevice->is_device_id(src))
+                    || (telegram->operation != Telegram::Operation::RX_READ && src == EMSbus::ems_bus_id() && emsdevice->is_device_id(dest))) {
+                    type_name = emsdevice->telegram_type_name(telegram);
+                }
             }
         }
     }
@@ -867,7 +870,7 @@ void EMSESP::process_version(std::shared_ptr<const Telegram> telegram) {
 // returns false if there are none found
 bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
     // if watching or reading...
-    if ((telegram->type_id == read_id_ || telegram->type_id == response_id_) && (telegram->dest == txservice_.ems_bus_id())) {
+    if ((telegram->type_id == read_id_ || telegram->type_id == response_id_) && (telegram->dest == EMSbus::ems_bus_id())) {
         if (telegram->type_id == response_id_) {
             if (!trace_raw_) {
                 LOG_TRACE("%s", pretty_telegram(telegram).c_str());
@@ -896,7 +899,7 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
     }
 
     // only process broadcast telegrams or ones sent to us on request
-    // if ((telegram->dest != 0x00) && (telegram->dest != rxservice_.ems_bus_id())) {
+    // if ((telegram->dest != 0x00) && (telegram->dest != EMSbus::ems_bus_id())) {
     if (telegram->operation == Telegram::Operation::RX_READ) {
         // LOG_DEBUG("read telegram received, not processing");
         return false;
@@ -924,13 +927,13 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
     bool found       = false;
     bool knowndevice = false;
     for (const auto & emsdevice : emsdevices) {
-        if (emsdevice->is_device_id(telegram->src)) {
+        if (emsdevice->is_device_id(telegram->src) && (telegram->dest == 0 || telegram->dest == EMSbus::ems_bus_id())) {
             knowndevice = true;
             found       = emsdevice->handle_telegram(telegram);
             // if we correctly processed the telegram then follow up with sending it via MQTT (if enabled)
             if (found && Mqtt::connected()) {
                 if ((mqtt_.get_publish_onchange(emsdevice->device_type()) && emsdevice->has_update())
-                    || (telegram->type_id == publish_id_ && telegram->dest == txservice_.ems_bus_id())) {
+                    || (telegram->type_id == publish_id_ && telegram->dest == EMSbus::ems_bus_id())) {
                     if (telegram->type_id == publish_id_) {
                         publish_id_ = 0;
                     }
@@ -947,7 +950,7 @@ bool EMSESP::process_telegram(std::shared_ptr<const Telegram> telegram) {
                 emsdevice->add_handlers_ignored(telegram->type_id);
             }
             break;
-        } else if (emsdevice->is_device_id(telegram->dest)) {
+        } else if (emsdevice->is_device_id(telegram->dest) && telegram->src != EMSbus::ems_bus_id()) {
             emsdevice->handle_telegram(telegram);
         }
     }
@@ -1021,7 +1024,7 @@ void EMSESP::show_devices(uuid::console::Shell & shell) {
 // if its not in our database, we don't add it
 bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const char * version, const uint8_t brand) {
     // don't add ourselves!
-    if (device_id == rxservice_.ems_bus_id()) {
+    if (device_id == EMSbus::ems_bus_id()) {
         return false;
     }
 
@@ -1062,7 +1065,7 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
                     device_p = &device;
                     break;
                 }
-                if ((device_id >= EMSdevice::EMS_DEVICE_ID_HS1 && device_id <= EMSdevice::EMS_DEVICE_ID_HS16)) {
+                if (device_id >= EMSdevice::EMS_DEVICE_ID_HS1 && device_id <= EMSdevice::EMS_DEVICE_ID_HS16) {
                     device_p              = &device;
                     device_p->device_type = DeviceType::HEATSOURCE;
                     break;
@@ -1178,14 +1181,14 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
     Command::add(
         device_type,
         F_(info),
-        [device_type](const char * value, const int8_t id, JsonObject & output) {
+        [device_type](const char * value, const int8_t id, JsonObject output) {
             return EMSdevice::export_values(device_type, output, id, EMSdevice::OUTPUT_TARGET::API_VERBOSE);
         },
         FL_(info_cmd));
     Command::add(
         device_type,
         F_(values),
-        [device_type](const char * value, const int8_t id, JsonObject & output) {
+        [device_type](const char * value, const int8_t id, JsonObject output) {
             return EMSdevice::export_values(device_type,
                                             output,
                                             id,
@@ -1196,12 +1199,12 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
     Command::add(
         device_type,
         F_(commands),
-        [device_type](const char * value, const int8_t id, JsonObject & output) { return command_commands(device_type, output, id); },
+        [device_type](const char * value, const int8_t id, JsonObject output) { return command_commands(device_type, output, id); },
         FL_(commands_cmd));
     Command::add(
         device_type,
         F_(entities),
-        [device_type](const char * value, const int8_t id, JsonObject & output) { return command_entities(device_type, output, id); },
+        [device_type](const char * value, const int8_t id, JsonObject output) { return command_entities(device_type, output, id); },
         FL_(entities_cmd));
 
     // MQTT subscribe to the device e.g. "ems-esp/boiler/#"
@@ -1212,7 +1215,7 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
 }
 
 // list device entities
-bool EMSESP::command_entities(uint8_t device_type, JsonObject & output, const int8_t id) {
+bool EMSESP::command_entities(uint8_t device_type, JsonObject output, const int8_t id) {
     JsonObject node;
 
     for (const auto & emsdevice : emsdevices) {
@@ -1226,7 +1229,7 @@ bool EMSESP::command_entities(uint8_t device_type, JsonObject & output, const in
 }
 
 // list all available commands, return as json
-bool EMSESP::command_commands(uint8_t device_type, JsonObject & output, const int8_t id) {
+bool EMSESP::command_commands(uint8_t device_type, JsonObject output, const int8_t id) {
     return Command::list(device_type, output);
 }
 
@@ -1265,7 +1268,7 @@ void EMSESP::incoming_telegram(uint8_t * data, const uint8_t length) {
 #endif
     // check first for echo
     uint8_t first_value = data[0];
-    if (((first_value & 0x7F) == txservice_.ems_bus_id()) && (length > 1)) {
+    if (((first_value & 0x7F) == EMSbus::ems_bus_id()) && (length > 1)) {
         // if we ask ourself at roomcontrol for version e.g. 0B 98 02 00 20
         Roomctrl::check((data[1] ^ 0x80 ^ rxservice_.ems_mask()), data, length);
 #ifdef EMSESP_UART_DEBUG
@@ -1336,7 +1339,7 @@ void EMSESP::incoming_telegram(uint8_t * data, const uint8_t length) {
             wait_km_     = true;
             connect_time = uuid::get_uptime_sec();
         }
-        if (poll_id == txservice_.ems_bus_id()) {
+        if (poll_id == EMSbus::ems_bus_id()) {
             EMSbus::last_bus_activity(uuid::get_uptime()); // set the flag indication the EMS bus is active
         }
         if (wait_km_) {
diff --git a/src/emsesp.h b/src/emsesp.h
index be5ec0e2b..324ed9ad5 100644
--- a/src/emsesp.h
+++ b/src/emsesp.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -66,17 +66,6 @@
 
 #define WATCH_ID_NONE 0 // no watch id set
 
-// uses StaticJsonDocument
-#define EMSESP_JSON_SIZE_SMALL 256
-#define EMSESP_JSON_SIZE_MEDIUM 768
-#define EMSESP_JSON_SIZE_LARGE 1024 // used in forming HA config payloads, also in *AsyncJsonResponse
-
-// used in larger buffers like DynamicJsonDocument
-#define EMSESP_JSON_SIZE_XLARGE 2048
-#define EMSESP_JSON_SIZE_XXLARGE 4096
-#define EMSESP_JSON_SIZE_XXXLARGE 16384
-#define EMSESP_JSON_SIZE_XXXXLARGE 20480 // web output
-
 // helpers for callback functions
 #define MAKE_PF_CB(__f) [&](std::shared_ptr<const Telegram> t) { __f(t); }                  // for Process Function callbacks to EMSDevice::process_function_p
 #define MAKE_CF_CB(__f) [&](const char * value, const int8_t id) { return __f(value, id); } // for Command Function callbacks Command::cmd_function_p
@@ -136,7 +125,7 @@ class EMSESP {
     static uint8_t count_devices();
     static uint8_t device_index(const uint8_t device_type, const uint8_t unique_id);
 
-    static bool get_device_value_info(JsonObject & root, const char * cmd, const int8_t id, const uint8_t devicetype);
+    static bool get_device_value_info(JsonObject root, const char * cmd, const int8_t id, const uint8_t devicetype);
 
     static void show_device_values(uuid::console::Shell & shell);
     static void show_sensor_values(uuid::console::Shell & shell);
@@ -245,8 +234,8 @@ class EMSESP {
     static void        process_version(std::shared_ptr<const Telegram> telegram);
     static void        publish_response(std::shared_ptr<const Telegram> telegram);
     static void        publish_all_loop();
-    static bool        command_commands(uint8_t device_type, JsonObject & output, const int8_t id);
-    static bool        command_entities(uint8_t device_type, JsonObject & output, const int8_t id);
+    static bool        command_commands(uint8_t device_type, JsonObject output, const int8_t id);
+    static bool        command_entities(uint8_t device_type, JsonObject output, const int8_t id);
 
     static constexpr uint32_t EMS_FETCH_FREQUENCY = 60000; // check every minute
     static constexpr uint8_t  EMS_WAIT_KM_TIMEOUT = 60;    // wait one minute
diff --git a/src/emsesp_stub.hpp b/src/emsesp_stub.hpp
index 69ece6f7e..0df912ef1 100644
--- a/src/emsesp_stub.hpp
+++ b/src/emsesp_stub.hpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/emsfactory.h b/src/emsfactory.h
index 8c3eb17ad..3117afc84 100644
--- a/src/emsfactory.h
+++ b/src/emsfactory.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/helpers.cpp b/src/helpers.cpp
index c9c5eb9b5..5fc0e3129 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/helpers.h b/src/helpers.h
index ea1422dcd..a31567e84 100644
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/locale_common.h b/src/locale_common.h
index 9a4f69c07..c34c30259 100644
--- a/src/locale_common.h
+++ b/src/locale_common.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -249,6 +249,7 @@ MAKE_WORD_CUSTOM(uom_l, "l")
 MAKE_WORD_CUSTOM(uom_kmin, "K*min")
 MAKE_WORD_CUSTOM(uom_k, "K")
 MAKE_WORD_CUSTOM(uom_volts, "V")
+MAKE_WORD_CUSTOM(uom_mbar, "mbar")
 
 // MQTT topics and prefixes
 MAKE_WORD_CUSTOM(heating_active, "heating_active")
diff --git a/src/locale_translations.h b/src/locale_translations.h
index 340e1b394..ab982664a 100644
--- a/src/locale_translations.h
+++ b/src/locale_translations.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -286,7 +286,7 @@ MAKE_WORD_TRANSLATION(partymode, "party", "Party", "party", "", "impreza", "", "
 MAKE_WORD_TRANSLATION(fireplace, "fireplace", "Kamin", "haard", "", "kominek", "", "", "şömine", "camino", "krb") // TODO translate
 
 // MQTT Discovery - this is special device entity for 'climate'
-MAKE_TRANSLATION(haclimate, "haclimate", "Discovery current room temperature", "Discovery Temperatur", "Discovery huidige kamertemperatuur", "", "termostat w HA", "HA Avlest temp", "", "Güncel osa sıcaklığı", "verifica temperatura ambiente attuale", "Zistiť aktuálnu teplotu v miestnosti") // TODO translate
+MAKE_TRANSLATION(haclimate, "haclimate", "mqtt discovery current room temperature", "Discovery Temperatur", "Discovery huidige kamertemperatuur", "", "termostat w HA", "HA Avlest temp", "", "Güncel osa sıcaklığı", "verifica temperatura ambiente attuale", "Zistiť aktuálnu teplotu v miestnosti") // TODO translate
 
 // Entity translations: tag, mqtt, en, de, nl, sv, pl, no, fr, tr, it, sk
 // Boiler
@@ -463,6 +463,7 @@ MAKE_TRANSLATION(hpPumpMode, "hppumpmode", "primary heatpump mode", "Modus Haupt
 MAKE_TRANSLATION(instantstart, "instantstart", "instant start", "Sofortstart", "", "", "natychmiastowy start", "", "", "", "", "") // TODO translate
 MAKE_TRANSLATION(heatondelay, "heatondelay", "heat-on delay", "Einschaltverzögerung Heizen", "", "", "opóźnienie włączania ogrzewania", "", "", "", "", "") // TODO translate
 MAKE_TRANSLATION(heatoffdelay, "heatoffdelay", "heat-off delay", "Ausschaltverzögerung Heizen", "", "", "opóźnienie włączania ogrzewania", "", "", "", "", "") // TODO translate
+MAKE_TRANSLATION(hpSetDiffPress, "hpsetdiffpress", "set differental pressure", "Pumpensolldruck", "", "", "", "", "", "", "", "") // TODO translate
 
 // hybrid heatpump
 MAKE_TRANSLATION(hybridStrategy, "hybridstrategy", "hybrid control strategy", "Hybrid Strategie", "Hybride strategie", "Hybrid kontrollstrategi", "strategia sterowania hybrydowego", "hybrid kontrollstrategi", "stratégie contrôle hybride", "hibrit kontrol stratejisi", "strategia comtrollo ibrido", "hybridná stratégia riadenia")
diff --git a/src/main.cpp b/src/main.cpp
index 15acb568d..a4ebccc72 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 5b0f81579..67cbb54ba 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -263,9 +263,9 @@ void Mqtt::on_message(const char * topic, const uint8_t * payload, size_t len) {
         }
     }
 
-    StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> input_doc;
-    DynamicJsonDocument                        output_doc(EMSESP_JSON_SIZE_XLARGE);
-    JsonObject                                 input, output;
+    JsonDocument input_doc;
+    JsonDocument output_doc;
+    JsonObject   input, output;
 
     // convert payload into a json doc
     // if the payload doesn't not contain the key 'value' or 'data', treat the whole payload as the 'value'
@@ -515,8 +515,7 @@ void Mqtt::on_connect() {
     }
 
     // send initial MQTT messages for some of our services
-    EMSESP::shower_.set_shower_state(false, true); // Send shower_activated as false
-    EMSESP::system_.send_heartbeat();              // send heartbeat
+    EMSESP::system_.send_heartbeat(); // send heartbeat
 
     // re-subscribe to all custom registered MQTT topics
     resubscribe();
@@ -531,7 +530,7 @@ void Mqtt::on_connect() {
 // e.g. homeassistant/sensor/ems-esp/status/config
 // all the values from the heartbeat payload will be added as attributes to the entity state
 void Mqtt::ha_status() {
-    StaticJsonDocument<EMSESP_JSON_SIZE_LARGE> doc;
+    JsonDocument doc;
 
     char uniq[70];
     if (Mqtt::entity_format() == entityFormat::MULTI_SHORT) {
@@ -554,15 +553,15 @@ void Mqtt::ha_status() {
     // doc["avty_t"]      = "~/status"; // commented out, as it causes errors in HA sometimes
     // doc["json_attr_t"] = "~/heartbeat"; // store also as HA attributes
 
-    JsonObject dev = doc.createNestedObject("dev");
+    JsonObject dev = doc["dev"].to<JsonObject>();
     dev["name"]    = Mqtt::basename();
     dev["sw"]      = "v" + std::string(EMSESP_APP_VERSION);
-    dev["mf"]      = "proddy";
+    dev["mf"]      = "EMS-ESP";
     dev["mdl"]     = "EMS-ESP";
 #ifndef EMSESP_STANDALONE
     dev["cu"] = "http://" + (EMSESP::system_.ethernet_connected() ? ETH.localIP().toString() : WiFi.localIP().toString());
 #endif
-    JsonArray ids = dev.createNestedArray("ids");
+    JsonArray ids = dev["ids"].to<JsonArray>();
     ids.add(Mqtt::basename());
 
     char topic[MQTT_TOPIC_MAX_SIZE];
@@ -684,12 +683,12 @@ bool Mqtt::queue_publish(const char * topic, const std::string & payload) {
     return queue_publish_message((topic), payload, mqtt_retain_);
 }
 
-bool Mqtt::queue_publish(const char * topic, const JsonObject & payload) {
+bool Mqtt::queue_publish(const char * topic, const JsonObjectConst payload) {
     return queue_publish_retain(topic, payload, mqtt_retain_);
 }
 
 // publish json doc, only if its not empty
-bool Mqtt::queue_publish(const std::string & topic, const JsonObject & payload) {
+bool Mqtt::queue_publish(const std::string & topic, const JsonObjectConst payload) {
     return queue_publish_retain(topic, payload, mqtt_retain_);
 }
 
@@ -699,11 +698,11 @@ bool Mqtt::queue_publish_retain(const char * topic, const std::string & payload,
 }
 
 // publish json doc, only if its not empty, using the retain flag
-bool Mqtt::queue_publish_retain(const std::string & topic, const JsonObject & payload, const bool retain) {
+bool Mqtt::queue_publish_retain(const std::string & topic, const JsonObjectConst payload, const bool retain) {
     return queue_publish_retain(topic.c_str(), payload, retain);
 }
 
-bool Mqtt::queue_publish_retain(const char * topic, const JsonObject & payload, const bool retain) {
+bool Mqtt::queue_publish_retain(const char * topic, const JsonObjectConst payload, const bool retain) {
     if (payload.size()) {
         std::string payload_text;
         payload_text.reserve(measureJson(payload) + 1);
@@ -723,7 +722,7 @@ bool Mqtt::queue_remove_topic(const char * topic) {
 }
 
 // queue a Home Assistant config topic and payload, with retain flag off.
-bool Mqtt::queue_ha(const char * topic, const JsonObject & payload) {
+bool Mqtt::queue_ha(const char * topic, const JsonObjectConst payload) {
     if (!enabled()) {
         return false;
     }
@@ -738,12 +737,12 @@ bool Mqtt::queue_ha(const char * topic, const JsonObject & payload) {
 // create's a ha sensor config topic from a device value object
 // and also takes a flag (create_device_config) used to also create the main HA device config. This is only needed for one entity
 bool Mqtt::publish_ha_sensor_config(DeviceValue & dv, const char * model, const char * brand, const bool remove, const bool create_device_config) {
-    StaticJsonDocument<EMSESP_JSON_SIZE_LARGE> dev_json;
+    JsonDocument dev_json;
 
     // always create the ids (discovery indentifiers)
     // with the name always
     // and the manufacturer and model if we're creating the device config for the first entity
-    JsonArray ids = dev_json.createNestedArray("ids");
+    JsonArray ids = dev_json["ids"].to<JsonArray>();
     char      ha_device[40];
     auto      device_type_name = EMSdevice::device_type_2_device_name(dv.device_type);
     snprintf(ha_device, sizeof(ha_device), "%s-%s", Mqtt::basename().c_str(), device_type_name);
@@ -754,10 +753,11 @@ bool Mqtt::publish_ha_sensor_config(DeviceValue & dv, const char * model, const
     dev_json["name"] = Mqtt::basename() + " " + cap_name;
     free(cap_name);
 
+    // create only once per category
     if (create_device_config) {
         dev_json["mf"]         = brand;
         dev_json["mdl"]        = model;
-        dev_json["via_device"] = "ems-esp";
+        dev_json["via_device"] = Mqtt::basename();
     }
 
     // calculate the min and max
@@ -789,11 +789,11 @@ bool Mqtt::publish_ha_sensor_config(DeviceValue & dv, const char * model, const
 
 // publish HA sensor for System using the heartbeat tag
 bool Mqtt::publish_system_ha_sensor_config(uint8_t type, const char * name, const char * entity, const uint8_t uom) {
-    StaticJsonDocument<EMSESP_JSON_SIZE_LARGE> doc;
-    JsonObject                                 dev_json = doc.createNestedObject("dev");
+    JsonDocument doc;
+    JsonObject   dev_json = doc["dev"].to<JsonObject>();
 
     dev_json["name"] = Mqtt::basename();
-    JsonArray ids    = dev_json.createNestedArray("ids");
+    JsonArray ids    = dev_json["ids"].to<JsonArray>();
     ids.add(Mqtt::basename());
 
     return publish_ha_sensor_config(
@@ -803,21 +803,21 @@ bool Mqtt::publish_system_ha_sensor_config(uint8_t type, const char * name, cons
 // MQTT discovery configs
 // entity must match the key/value pair in the *_data topic
 // note: some extra string copying done here, it looks messy but does help with heap fragmentation issues
-bool Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdevice::DeviceValueType
-                                    uint8_t               tag,         // EMSdevice::DeviceValueTAG
-                                    const char * const    fullname,    // fullname, already translated
-                                    const char * const    en_name,     // original name in english
-                                    const uint8_t         device_type, // EMSdevice::DeviceType
-                                    const char * const    entity,      // same as shortname
-                                    const uint8_t         uom,         // EMSdevice::DeviceValueUOM (0=NONE)
-                                    const bool            remove,      // true if we want to remove this topic
-                                    const bool            has_cmd,
-                                    const char * const ** options,
-                                    uint8_t               options_size,
-                                    const int16_t         dv_set_min,
-                                    const uint32_t        dv_set_max,
-                                    const int8_t          num_op,
-                                    const JsonObject &    dev_json) {
+bool Mqtt::publish_ha_sensor_config(uint8_t                 type,        // EMSdevice::DeviceValueType
+                                    uint8_t                 tag,         // EMSdevice::DeviceValueTAG
+                                    const char * const      fullname,    // fullname, already translated
+                                    const char * const      en_name,     // original name in english
+                                    const uint8_t           device_type, // EMSdevice::DeviceType
+                                    const char * const      entity,      // same as shortname
+                                    const uint8_t           uom,         // EMSdevice::DeviceValueUOM (0=NONE)
+                                    const bool              remove,      // true if we want to remove this topic
+                                    const bool              has_cmd,
+                                    const char * const **   options,
+                                    uint8_t                 options_size,
+                                    const int16_t           dv_set_min,
+                                    const uint32_t          dv_set_max,
+                                    const int8_t            num_op,
+                                    const JsonObjectConst dev_json) {
     // ignore if name (fullname) is empty
     if (!fullname || !en_name) {
         return false;
@@ -877,8 +877,8 @@ bool Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
         case DeviceValueType::USHORT:
         case DeviceValueType::ULONG:
             // number - https://www.home-assistant.io/integrations/number.mqtt
-            // Domoticz does not support number, use sensor
-            if (discovery_type() == discoveryType::HOMEASSISTANT) {
+            // older Domoticz does not support number, use sensor
+            if (discovery_type() == discoveryType::HOMEASSISTANT || discovery_type() == discoveryType::DOMOTICZ_LATEST) {
                 snprintf(topic, sizeof(topic), "number/%s", config_topic);
                 readonly_sensors = false;
             } else {
@@ -920,7 +920,7 @@ bool Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
     }
 
     // build the payload
-    StaticJsonDocument<EMSESP_JSON_SIZE_LARGE> doc;
+    JsonDocument doc;
     doc["uniq_id"] = uniq_id;
     doc["obj_id"]  = uniq_id; // same as unique_id
 
@@ -945,7 +945,7 @@ bool Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
 
         // extend for enums, add options
         if (type == DeviceValueType::ENUM) {
-            JsonArray option_list = doc.createNestedArray("ops"); // options
+            JsonArray option_list = doc["ops"].to<JsonArray>();
             if (EMSESP::system_.enum_format() == ENUM_FORMAT_INDEX) {
                 // use index numbers
                 for (uint8_t i = 0; i < options_size; i++) {
@@ -1151,8 +1151,8 @@ bool Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
         }
     }
 
-    doc["dev"] = dev_json;                                   // add the dev json object to the end
-    add_avty_to_doc(stat_t, doc.as<JsonObject>(), val_cond); // add "availability" section
+    doc["dev"] = dev_json;                                         // add the dev json object to the end
+    add_ha_sections_to_doc(nullptr, stat_t, doc, false, val_cond); // no name, since the "dev" has already been added
 
     return queue_ha(topic, doc.as<JsonObject>());
 }
@@ -1231,7 +1231,7 @@ bool Mqtt::publish_ha_climate_config(const uint8_t tag, const bool has_roomtemp,
     snprintf(temp_cmd_s, sizeof(temp_cmd_s), "~/thermostat/hc%d/seltemp", hc_num);
     snprintf(mode_cmd_s, sizeof(mode_cmd_s), "~/thermostat/hc%d/mode", hc_num);
 
-    StaticJsonDocument<EMSESP_JSON_SIZE_XLARGE> doc; // 1024 is not enough
+    JsonDocument doc;
 
     doc["~"]             = Mqtt::base();
     doc["uniq_id"]       = uniq_id_s;
@@ -1254,24 +1254,14 @@ bool Mqtt::publish_ha_climate_config(const uint8_t tag, const bool has_roomtemp,
     doc["mode_cmd_t"] = mode_cmd_s;
 
     // the HA climate component only responds to auto, heat and off
-    JsonArray modes = doc.createNestedArray("modes");
+    JsonArray modes = doc["modes"].to<JsonArray>();
 
     modes.add("auto");
     modes.add("heat");
     modes.add("off");
 
-    JsonObject dev = doc.createNestedObject("dev");
-    JsonArray  ids = dev.createNestedArray("ids");
-
-    char ha_device[40];
-    snprintf(ha_device, sizeof(ha_device), "%s-thermostat", Mqtt::basename().c_str());
-    ids.add(ha_device);
-
     // device name must be different to the entity name, take the ids value we just created
-    dev["name"] = ha_device;
-
-    // add "availability" section
-    add_avty_to_doc(topic_t, doc.as<JsonObject>(), seltemp_cond, has_roomtemp ? currtemp_cond : nullptr, hc_mode_cond);
+    add_ha_sections_to_doc("thermostat", topic_t, doc, false, seltemp_cond, has_roomtemp ? currtemp_cond : nullptr, hc_mode_cond);
 
     return queue_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag
 }
@@ -1295,42 +1285,74 @@ std::string Mqtt::tag_to_topic(uint8_t device_type, uint8_t tag) {
     }
 }
 
-// adds "availability" section to HA Discovery config
-void Mqtt::add_avty_to_doc(const char * state_t, const JsonObject & doc, const char * cond1, const char * cond2, const char * negcond) {
+// adds availability, dev, ids to the config section to HA Discovery config
+void Mqtt::add_ha_sections_to_doc(const char *   name,
+                                  const char *   state_t,
+                                  JsonDocument & config,
+                                  const bool     is_first,
+                                  const char *   cond1,
+                                  const char *   cond2,
+                                  const char *   negcond) {
+    // adds dev section to HA Discovery config
+    if (name != nullptr) {
+        JsonObject dev      = config["dev"].to<JsonObject>();
+        char *     cap_name = strdup(name);
+        cap_name[0]         = toupper(name[0]); // capitalize first letter
+        dev["name"]         = std::string(Mqtt::basename()) + " " + cap_name;
+        // if it's the first in the category, attach the group to the main HA device
+        if (is_first) {
+            dev["mf"]         = "EMS-ESP";
+            dev["mdl"]        = cap_name;
+            dev["via_device"] = Mqtt::basename();
+        }
+        JsonArray ids = dev["ids"].to<JsonArray>();
+        ids.add(Mqtt::basename() + "-" + Helpers::toLower(name));
+        free(cap_name);
+    }
+
+    // adds "availability" section to HA Discovery config
+    JsonArray    avty = config["avty"].to<JsonArray>();
+    JsonDocument avty_json;
+
     const char * tpl_draft = "{{'online' if %s else 'offline'}}";
-    char         tpl[150];
-    JsonArray    avty = doc.createNestedArray("avty");
-
-    StaticJsonDocument<512> avty_json;
 
+    // EMS-ESP status check
+    char tpl[150];
     snprintf(tpl, sizeof(tpl), "%s/status", Mqtt::base().c_str());
     avty_json["t"] = tpl;
     snprintf(tpl, sizeof(tpl), tpl_draft, "value == 'online'");
     avty_json["val_tpl"] = tpl;
-    avty.add(avty_json);
-    avty_json.clear();
-    avty_json["t"] = state_t;
-    snprintf(tpl, sizeof(tpl), tpl_draft, cond1 == nullptr ? "value is defined" : cond1);
-    avty_json["val_tpl"] = tpl;
-    avty.add(avty_json);
+    avty.add(avty_json); // returns 0 if no mem
 
-    if (cond2 != nullptr) {
+    // skip conditional Jinja2 templates if not home assistant
+    if (discovery_type() == discoveryType::HOMEASSISTANT) {
+        // condition 1
         avty_json.clear();
         avty_json["t"] = state_t;
-        snprintf(tpl, sizeof(tpl), tpl_draft, cond2);
+        snprintf(tpl, sizeof(tpl), tpl_draft, cond1 == nullptr ? "value is defined" : cond1);
         avty_json["val_tpl"] = tpl;
-        avty.add(avty_json);
-    }
+        avty.add(avty_json); // returns 0 if no mem
 
-    if (negcond != nullptr) {
-        avty_json.clear();
-        avty_json["t"] = state_t;
-        snprintf(tpl, sizeof(tpl), "{{'offline' if %s else 'online'}}", negcond);
-        avty_json["val_tpl"] = tpl;
-        avty.add(avty_json);
-    }
+        // condition 2
+        if (cond2 != nullptr) {
+            avty_json.clear();
+            avty_json["t"] = state_t;
+            snprintf(tpl, sizeof(tpl), tpl_draft, cond2);
+            avty_json["val_tpl"] = tpl;
+            avty.add(avty_json); // returns 0 if no mem
+        }
 
-    doc["avty_mode"] = "all";
+        // negative condition
+        if (negcond != nullptr) {
+            avty_json.clear();
+            avty_json["t"] = state_t;
+            snprintf(tpl, sizeof(tpl), "{{'offline' if %s else 'online'}}", negcond);
+            avty_json["val_tpl"] = tpl;
+            avty.add(avty_json); // returns 0 if no mem
+        }
+
+        config["avty_mode"] = "all";
+    }
 }
 
 } // namespace emsesp
\ No newline at end of file
diff --git a/src/mqtt.h b/src/mqtt.h
index b086d762c..ec4ea2d9d 100644
--- a/src/mqtt.h
+++ b/src/mqtt.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ using mqtt_sub_function_p = std::function<bool(const char * message)>;
 
 class Mqtt {
   public:
-    enum discoveryType : uint8_t { HOMEASSISTANT, DOMOTICZ };
+    enum discoveryType : uint8_t { HOMEASSISTANT, DOMOTICZ, DOMOTICZ_LATEST };
     enum entityFormat : uint8_t { SINGLE_LONG, SINGLE_SHORT, MULTI_SHORT };
 
     void loop();
@@ -68,13 +68,13 @@ class Mqtt {
 
     static bool queue_publish(const std::string & topic, const std::string & payload);
     static bool queue_publish(const char * topic, const char * payload);
-    static bool queue_publish(const std::string & topic, const JsonObject & payload);
-    static bool queue_publish(const char * topic, const JsonObject & payload);
+    static bool queue_publish(const std::string & topic, const JsonObjectConst payload);
+    static bool queue_publish(const char * topic, const JsonObjectConst payload);
     static bool queue_publish(const char * topic, const std::string & payload);
-    static bool queue_publish_retain(const std::string & topic, const JsonObject & payload, const bool retain);
+    static bool queue_publish_retain(const std::string & topic, const JsonObjectConst payload, const bool retain);
     static bool queue_publish_retain(const char * topic, const std::string & payload, const bool retain);
-    static bool queue_publish_retain(const char * topic, const JsonObject & payload, const bool retain);
-    static bool queue_ha(const char * topic, const JsonObject & payload);
+    static bool queue_publish_retain(const char * topic, const JsonObjectConst payload, const bool retain);
+    static bool queue_ha(const char * topic, const JsonObjectConst payload);
     static bool queue_remove_topic(const char * topic);
 
     static bool publish_ha_sensor_config(DeviceValue & dv, const char * model, const char * brand, const bool remove, const bool create_device_config = false);
@@ -92,7 +92,7 @@ class Mqtt {
                                          const int16_t         dv_set_min,
                                          const uint32_t        dv_set_max,
                                          const int8_t          num_op,
-                                         const JsonObject &    dev_json);
+                                         const JsonObjectConst dev_json);
 
     static bool publish_system_ha_sensor_config(uint8_t type, const char * name, const char * entity, const uint8_t uom);
     static bool publish_ha_climate_config(const uint8_t tag, const bool has_roomtemp, const bool remove = false, const int16_t min = 5, const uint32_t max = 30);
@@ -168,6 +168,10 @@ class Mqtt {
         return entity_format_;
     }
 
+    static void entity_format(uint8_t n) {
+        entity_format_ = n;
+    }
+
     static uint8_t discovery_type() {
         return discovery_type_;
     }
@@ -218,8 +222,13 @@ class Mqtt {
 
     static std::string tag_to_topic(uint8_t device_type, uint8_t tag);
 
-    static void
-    add_avty_to_doc(const char * state_t, const JsonObject & doc, const char * cond1 = nullptr, const char * cond2 = nullptr, const char * negcond = nullptr);
+    static void add_ha_sections_to_doc(const char *   name,
+                                       const char *   state_t,
+                                       JsonDocument & config,
+                                       const bool     is_first = false,
+                                       const char *   cond1    = nullptr,
+                                       const char *   cond2    = nullptr,
+                                       const char *   negcond  = nullptr);
 
   private:
     static uuid::log::Logger logger_;
diff --git a/src/roomcontrol.cpp b/src/roomcontrol.cpp
index 92472b8aa..41d30c91d 100644
--- a/src/roomcontrol.cpp
+++ b/src/roomcontrol.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@ uint8_t  Roomctrl::type_            = RC20;
  * set the temperature,
  */
 void Roomctrl::set_remotetemp(const uint8_t type, const uint8_t hc, const int16_t temp) {
-    if (hc >= HCS || (type != RC20 && type != FB10 && type != RC100H && type != SENSOR)) {
+    if (hc >= HCS || (type != RC20 && type != FB10 && type != RC100H && type != SENSOR && type != RC200)) {
         return;
     }
     type_ = type;
@@ -65,6 +65,7 @@ uint8_t Roomctrl::get_hc(uint8_t addr) {
     switch (type_) {
     case SENSOR:
         return addr - 0x40;
+    case RC200:
     case RC100H:
         return addr - 0x38;
     case FB10:
@@ -103,8 +104,11 @@ void Roomctrl::send(const uint8_t addr) {
                 } else {
                     rc_time_[hc] = uuid::get_uptime();
                 }
-                temperature(addr, 0x10, hc); // send to master-thermostat (https://github.com/emsesp/EMS-ESP32/issues/336)
+                temperature(addr, 0x10, hc); // send to master-thermostat
             }
+        } else if (type_ == RC200) {
+            rc_time_[hc] = uuid::get_uptime();
+            temperature(addr, 0x10, hc);
         } else if (type_ == FB10) {
             rc_time_[hc] = uuid::get_uptime();
             temperature(addr, 0x10, hc); // send to master-thermostat (https://github.com/emsesp/EMS-ESP32/issues/336)
@@ -144,21 +148,21 @@ void Roomctrl::check(const uint8_t addr, const uint8_t * data, const uint8_t len
     // empty message back if temperature not set or unknown message type
     if (data[2] == EMSdevice::EMS_TYPE_VERSION) {
         version(addr, data[0]);
-    } else if (length == 5 && remotetemp_[hc] == EMS_VALUE_SHORT_NOTSET) {
+    } else if (length == 6 && remotetemp_[hc] == EMS_VALUE_SHORT_NOTSET) {
         unknown(addr, data[0], data[2], data[3]);
-    } else if (length == 7 && remotetemp_[hc] == EMS_VALUE_SHORT_NOTSET) {
+    } else if (length == 8 && remotetemp_[hc] == EMS_VALUE_SHORT_NOTSET) {
         unknown(addr, data[0], data[3], data[5], data[6]);
     } else if (data[2] == 0xAF && data[3] == 0) {
         temperature(addr, data[0], hc);
-    } else if (length == 7 && data[2] == 0xFF && data[3] == 0 && data[5] == 0 && data[6] == 0x23) { // Junkers
+    } else if (length == 8 && data[2] == 0xFF && data[3] == 0 && data[5] == 0 && data[6] == 0x23) { // Junkers
         temperature(addr, data[0], hc);
-    } else if (length == 7 && data[2] == 0xFF && data[3] == 0 && data[5] == 3 && data[6] == 0x2B) { // EMS+ temperature
+    } else if (length == 8 && data[2] == 0xFF && data[3] == 0 && data[5] == 3 && data[6] == 0x2B + hc) { // EMS+ temperature
         temperature(addr, data[0], hc);
-    } else if (length == 7 && data[2] == 0xFF && data[3] == 0 && data[5] == 3 && data[6] == 0x7B && remotehum_[hc] != EMS_VALUE_UINT_NOTSET) { // EMS+ humidity
+    } else if (length == 8 && data[2] == 0xFF && data[3] == 0 && data[5] == 3 && data[6] == 0x7B + hc && remotehum_[hc] != EMS_VALUE_UINT_NOTSET) { // EMS+ humidity
         humidity(addr, data[0], hc);
-    } else if (length == 5) { // ems query
+    } else if (length == 6) { // ems query
         unknown(addr, data[0], data[2], data[3]);
-    } else if (length == 7 && data[2] == 0xFF) { // ems+ query
+    } else if (length == 8 && data[2] == 0xFF) { // ems+ query
         unknown(addr, data[0], data[3], data[5], data[6]);
     }
 }
@@ -167,16 +171,27 @@ void Roomctrl::check(const uint8_t addr, const uint8_t * data, const uint8_t len
  * send version info RC20 (Prod. 113, Ver. 02.01) or RC20RF (Prod. 93, Ver. 02.00)
  */
 void Roomctrl::version(uint8_t addr, uint8_t dst) {
-    uint8_t data[10];
+    uint8_t data[15];
     data[0] = addr;
     data[1] = dst;
     data[2] = 0x02;
     data[3] = 0;
     data[4] = type_; // set RC20 id 113, Ver 02.01 or Junkers FB10 id 109, Ver 16.05, RC100H id 200 ver 40.04
-    data[5] = type_ == RC20 ? 2 : type_ == FB10 ? 16 : 40;
-    data[6] = type_ == RC20 ? 1 : type_ == FB10 ? 5 : 4;
-    data[7] = EMSbus::calculate_crc(data, 7); // apppend CRC
-    EMSuart::transmit(data, 8);
+    data[5] = type_ == RC20 ? 2 : type_ == FB10 ? 16 : type_ == RC200 ? 41 : 40;
+    data[6] = type_ == RC20 ? 1 : type_ == FB10 ? 5 : type_ == RC200 ? 8 : 4;
+    if (type_ != RC200) {
+        data[7] = EMSbus::calculate_crc(data, 7); // apppend CRC
+        EMSuart::transmit(data, 8);
+        return;
+    }
+    // RC200 adds some extra bytes
+    data[7] = 0;
+    data[8] = 0xFF, data[9] = 0;
+    data[10] = 0;
+    data[11] = 0;
+    data[12] = 0;
+    data[13] = EMSbus::calculate_crc(data, 13); // apppend CRC
+    EMSuart::transmit(data, 14);
 }
 
 /**
@@ -208,7 +223,7 @@ void Roomctrl::unknown(uint8_t addr, uint8_t dst, uint8_t offset, uint8_t typeh,
  * send the room temperature in message 0xAF
  */
 void Roomctrl::temperature(uint8_t addr, uint8_t dst, uint8_t hc) {
-    uint8_t data[10];
+    uint8_t data[12];
     data[0] = addr;
     data[1] = dst;
     if (type_ == RC20) { // RC20, telegram 0xAF
@@ -228,11 +243,24 @@ void Roomctrl::temperature(uint8_t addr, uint8_t dst, uint8_t hc) {
         data[7] = (uint8_t)(remotetemp_[hc] & 0xFF);
         data[8] = EMSbus::calculate_crc(data, 8); // apppend CRC
         EMSuart::transmit(data, 9);
-    } else if (type_ == RC100H) { // RC100H, telegram 42B
+    } else if (type_ == RC200) { // RC200, telegram 42B, ff
+        data[2]     = 0xFF;
+        data[3]     = 0;
+        data[4]     = 3;
+        data[5]     = 0x2B + hc;
+        data[6]     = (uint8_t)(remotetemp_[hc] >> 8);
+        data[7]     = (uint8_t)(remotetemp_[hc] & 0xFF);
+        uint16_t t1 = remotetemp_[hc] * 10 + 5;
+        data[8]     = (uint8_t)(t1 >> 8);
+        data[9]     = (uint8_t)(t1 & 0xFF);
+        data[10]    = 1;                               // not sure what this is and if we need it, maybe mode?
+        data[11]    = EMSbus::calculate_crc(data, 11); // apppend CRC
+        EMSuart::transmit(data, 12);
+    } else if (type_ == RC100H) { // RC100H, telegram 42B, ff
         data[2] = 0xFF;
         data[3] = 0;
         data[4] = 3;
-        data[5] = 0x2B;
+        data[5] = 0x2B + hc;
         data[6] = (uint8_t)(remotetemp_[hc] >> 8);
         data[7] = (uint8_t)(remotetemp_[hc] & 0xFF);
         data[8] = EMSbus::calculate_crc(data, 8); // apppend CRC
@@ -259,7 +287,7 @@ void Roomctrl::humidity(uint8_t addr, uint8_t dst, uint8_t hc) {
         data[2]  = 0xFF;
         data[3]  = 0;
         data[4]  = 3;
-        data[5]  = 0x7B;
+        data[5]  = 0x7B + hc;
         data[6]  = dew == EMS_VALUE_SHORT_NOTSET ? EMS_VALUE_INT_NOTSET : (uint8_t)((dew + 5) / 10);
         data[7]  = remotehum_[hc];
         data[8]  = (uint8_t)(dew << 8);
diff --git a/src/roomcontrol.h b/src/roomcontrol.h
index 6ac4993e5..11e134a67 100644
--- a/src/roomcontrol.h
+++ b/src/roomcontrol.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ class Roomctrl {
     static void check(const uint8_t addr, const uint8_t * data, const uint8_t length);
     static void set_remotetemp(const uint8_t type, const uint8_t hc, const int16_t temp);
     static void set_remotehum(const uint8_t type, const uint8_t hc, const int8_t hum);
-    enum : uint8_t { RC20 = 113, FB10 = 109, RC100H = 200, SENSOR = 0x40 };
+    enum : uint8_t { RC20 = 113, FB10 = 109, RC100H = 200, SENSOR = 0x40, RC200 = 157 };
 
   private:
     static constexpr uint8_t  ADDR          = 0x18;  // address for hc1
diff --git a/src/shower.cpp b/src/shower.cpp
index 3da18df2d..4d83c837d 100644
--- a/src/shower.cpp
+++ b/src/shower.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ void Shower::start() {
     Command::add(
         EMSdevice::DeviceType::BOILER,
         F_(coldshot),
-        [&](const char * value, const int8_t id, JsonObject & output) {
+        [&](const char * value, const int8_t id, JsonObject output) {
             LOG_INFO("Forcing coldshot...");
             if (shower_state_) {
                 output["message"] = "OK";
@@ -99,7 +99,7 @@ void Shower::loop() {
                 if ((timer_pause_ - timer_start_) > SHOWER_OFFSET_TIME) {
                     duration_ = (timer_pause_ - timer_start_ - SHOWER_OFFSET_TIME);
                     if (duration_ > SHOWER_MIN_DURATION) {
-                        StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc;
+                        JsonDocument doc;
 
                         // duration in seconds
                         doc["duration"] = (duration_ / 1000UL); // seconds
@@ -177,10 +177,10 @@ void Shower::set_shower_state(bool state, bool force) {
 
     // send out HA MQTT Discovery config topic
     if ((Mqtt::ha_enabled()) && (!ha_configdone_ || force)) {
-        StaticJsonDocument<EMSESP_JSON_SIZE_LARGE> doc;
-        char                                       topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
-        char                                       str[70];
-        char                                       stat_t[50];
+        JsonDocument doc;
+        char         topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
+        char         str[70];
+        char         stat_t[50];
 
         //
         // shower active
@@ -210,12 +210,7 @@ void Shower::set_shower_state(bool state, bool force) {
             doc["pl_off"] = Helpers::render_boolean(result, false);
         }
 
-        JsonObject dev = doc.createNestedObject("dev");
-        dev["name"]    = "EMS-ESP Shower";
-        JsonArray ids  = dev.createNestedArray("ids");
-        ids.add(Mqtt::basename() + "-shower");
-
-        Mqtt::add_avty_to_doc(stat_t, doc.as<JsonObject>()); // add "availability" section
+        Mqtt::add_ha_sections_to_doc("shower", stat_t, doc, true); // create first dev & ids
 
         snprintf(topic, sizeof(topic), "binary_sensor/%s/shower_active/config", Mqtt::basename().c_str());
         ha_configdone_ = Mqtt::queue_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag
@@ -240,12 +235,7 @@ void Shower::set_shower_state(bool state, bool force) {
         doc["dev_cla"]      = "duration";
         // doc["ent_cat"]      = "diagnostic";
 
-        JsonObject dev2 = doc.createNestedObject("dev");
-        dev2["name"]    = "EMS-ESP Shower";
-        JsonArray ids2  = dev2.createNestedArray("ids");
-        ids2.add(Mqtt::basename() + "-shower");
-
-        Mqtt::add_avty_to_doc(stat_t, doc.as<JsonObject>(), "value_json.duration is defined"); // add "availability" section
+        Mqtt::add_ha_sections_to_doc("shower", stat_t, doc, false, "value_json.duration is defined");
 
         snprintf(topic, sizeof(topic), "sensor/%s/shower_duration/config", Mqtt::basename().c_str());
         Mqtt::queue_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag
@@ -267,12 +257,7 @@ void Shower::set_shower_state(bool state, bool force) {
         doc["val_tpl"] = "{{value_json.timestamp if value_json.timestamp is defined else 0}}";
         // doc["ent_cat"] = "diagnostic";
 
-        JsonObject dev3 = doc.createNestedObject("dev");
-        dev3["name"]    = "EMS-ESP Shower";
-        JsonArray ids3  = dev3.createNestedArray("ids");
-        ids3.add(Mqtt::basename() + "-shower");
-
-        Mqtt::add_avty_to_doc(stat_t, doc.as<JsonObject>(), "value_json.timestamp is defined"); // add "availability" section
+        Mqtt::add_ha_sections_to_doc("shower", stat_t, doc, false, "value_json.timestamp is defined");
 
         snprintf(topic, sizeof(topic), "sensor/%s/shower_timestamp/config", Mqtt::basename().c_str());
         Mqtt::queue_ha(topic, doc.as<JsonObject>()); // publish the config payload with retain flag
diff --git a/src/shower.h b/src/shower.h
index b2504a6d6..fc60c8037 100644
--- a/src/shower.h
+++ b/src/shower.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/system.cpp b/src/system.cpp
index 78b6b1dca..9658b146c 100644
--- a/src/system.cpp
+++ b/src/system.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,8 +95,8 @@ bool System::command_send(const char * value, const int8_t id) {
     return EMSESP::txservice_.send_raw(value); // ignore id
 }
 
-bool System::command_response(const char * value, const int8_t id, JsonObject & output) {
-    DynamicJsonDocument doc(EMSESP_JSON_SIZE_LARGE);
+bool System::command_response(const char * value, const int8_t id, JsonObject output) {
+    JsonDocument doc;
     if (DeserializationError::Ok == deserializeJson(doc, Mqtt::get_response())) {
         for (JsonPair p : doc.as<JsonObject>()) {
             output[p.key()] = p.value();
@@ -109,24 +109,24 @@ bool System::command_response(const char * value, const int8_t id, JsonObject &
 
 // output all the EMS devices and their values, plus the sensors and any custom entities
 // not scheduler as these are records with no output data
-bool System::command_allvalues(const char * value, const int8_t id, JsonObject & output) {
-    DynamicJsonDocument doc(EMSESP_JSON_SIZE_XXXLARGE);
-    JsonObject          device_output;
+bool System::command_allvalues(const char * value, const int8_t id, JsonObject output) {
+    JsonDocument doc;
+    JsonObject   device_output;
 
     for (const auto & emsdevice : EMSESP::emsdevices) {
         std::string title = emsdevice->device_type_2_device_name_translated() + std::string(" ") + emsdevice->to_string();
-        device_output     = output.createNestedObject(title);
+        device_output     = output[title].to<JsonObject>();
         emsdevice->generate_values(device_output, DeviceValueTAG::TAG_NONE, true, EMSdevice::OUTPUT_TARGET::API_VERBOSE); // use nested for id -1 and 0
     }
 
     // Custom entities
-    device_output = output.createNestedObject("Custom Entities");
+    device_output = output["Custom Entities"].to<JsonObject>();
     EMSESP::webCustomEntityService.get_value_info(device_output, "");
 
     // Sensors
-    device_output = output.createNestedObject("Analog Sensors");
+    device_output = output["Analog Sensors"].to<JsonObject>();
     EMSESP::analogsensor_.command_info(nullptr, 0, device_output);
-    device_output = output.createNestedObject("Temperature Sensors");
+    device_output = output["Temperature Sensors"].to<JsonObject>();
     EMSESP::temperaturesensor_.command_info(nullptr, 0, device_output);
 
     return true;
@@ -586,7 +586,7 @@ void System::send_info_mqtt() {
         return;
     }
     _connection = connection;
-    StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> doc;
+    JsonDocument doc;
     doc["event"]   = "connected";
     doc["version"] = EMSESP_APP_VERSION;
 
@@ -632,7 +632,7 @@ void System::send_info_mqtt() {
 }
 
 // create the json for heartbeat
-bool System::heartbeat_json(JsonObject & output) {
+void System::heartbeat_json(JsonObject output) {
     uint8_t bus_status = EMSESP::bus_status();
     if (bus_status == EMSESP::BUS_STATUS_TX_ERRORS) {
         output["bus_status"] = "txerror";
@@ -684,8 +684,6 @@ bool System::heartbeat_json(JsonObject & output) {
         output["wifistrength"] = wifi_quality(rssi);
     }
 #endif
-
-    return true;
 }
 
 // send periodic MQTT message with system information
@@ -697,12 +695,11 @@ void System::send_heartbeat() {
 
     refreshHeapMem(); // refresh free heap and max alloc heap
 
-    StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> doc;
-    JsonObject                                  json = doc.to<JsonObject>();
+    JsonDocument doc;
+    JsonObject   json = doc.to<JsonObject>();
 
-    if (heartbeat_json(json)) {
-        Mqtt::queue_publish(F_(heartbeat), json); // send to MQTT with retain off. This will add to MQTT queue.
-    }
+    heartbeat_json(json);
+    Mqtt::queue_publish(F_(heartbeat), json); // send to MQTT with retain off. This will add to MQTT queue.
 }
 
 // initializes network
@@ -1051,8 +1048,8 @@ bool System::check_restore() {
     // see if we have a temp file, if so try and read it
     File new_file = LittleFS.open(TEMP_FILENAME_PATH);
     if (new_file) {
-        DynamicJsonDocument  jsonDocument = DynamicJsonDocument(FS_BUFFER_SIZE);
-        DeserializationError error        = deserializeJson(jsonDocument, new_file);
+        JsonDocument         jsonDocument;
+        DeserializationError error = deserializeJson(jsonDocument, new_file);
         if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
             JsonObject input = jsonDocument.as<JsonObject>();
             // see what type of file it is, either settings or customization. anything else is ignored
@@ -1168,20 +1165,20 @@ bool System::check_upgrade(bool factory_settings) {
 }
 
 // list commands
-bool System::command_commands(const char * value, const int8_t id, JsonObject & output) {
+bool System::command_commands(const char * value, const int8_t id, JsonObject output) {
     return Command::list(EMSdevice::DeviceType::SYSTEM, output);
 }
 
 // convert settings file into json object
-void System::extractSettings(const char * filename, const char * section, JsonObject & output) {
+void System::extractSettings(const char * filename, const char * section, JsonObject output) {
 #ifndef EMSESP_STANDALONE
     File settingsFile = LittleFS.open(filename);
     if (settingsFile) {
-        DynamicJsonDocument  jsonDocument = DynamicJsonDocument(FS_BUFFER_SIZE);
-        DeserializationError error        = deserializeJson(jsonDocument, settingsFile);
+        JsonDocument         jsonDocument;
+        DeserializationError error = deserializeJson(jsonDocument, settingsFile);
         if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) {
             JsonObject jsonObject = jsonDocument.as<JsonObject>();
-            JsonObject node       = output.createNestedObject(section);
+            JsonObject node       = output[section].to<JsonObject>();
             for (JsonPair kvp : jsonObject) {
                 node[kvp.key()] = kvp.value();
             }
@@ -1192,7 +1189,7 @@ void System::extractSettings(const char * filename, const char * section, JsonOb
 }
 
 // save settings file using input from a json object
-bool System::saveSettings(const char * filename, const char * section, JsonObject & input) {
+bool System::saveSettings(const char * filename, const char * section, JsonObject input) {
 #ifndef EMSESP_STANDALONE
     JsonObject section_json = input[section];
     if (section_json) {
@@ -1210,11 +1207,11 @@ bool System::saveSettings(const char * filename, const char * section, JsonObjec
 
 // export status information including the device information
 // http://ems-esp/api/system/info
-bool System::command_info(const char * value, const int8_t id, JsonObject & output) {
+bool System::command_info(const char * value, const int8_t id, JsonObject output) {
     JsonObject node;
 
     // System
-    node                     = output.createNestedObject("System Info");
+    node                     = output["System Info"].to<JsonObject>();
     node["version"]          = EMSESP_APP_VERSION;
     node["uptime"]           = uuid::log::format_timestamp_ms(uuid::get_uptime_ms(), 3);
     node["uptime (seconds)"] = uuid::get_uptime_sec();
@@ -1231,7 +1228,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
 
 #ifndef EMSESP_STANDALONE
     // Network Status
-    node = output.createNestedObject("Network Info");
+    node = output["Network Info"].to<JsonObject>();
     if (EMSESP::system_.ethernet_connected()) {
         node["network"]  = "Ethernet";
         node["hostname"] = ETH.getHostname();
@@ -1279,7 +1276,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
 #endif
 
     // NTP status
-    node = output.createNestedObject("NTP Info");
+    node = output["NTP Info"].to<JsonObject>();
 #ifndef EMSESP_STANDALONE
     node["NTP status"] = EMSESP::system_.ntp_connected() ? "connected" : "disconnected";
     EMSESP::esp8266React.getNTPSettingsService()->read([&](NTPSettings & settings) {
@@ -1290,7 +1287,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
     });
 
     // OTA status
-    node = output.createNestedObject("OTA Info");
+    node = output["OTA Info"].to<JsonObject>();
     EMSESP::esp8266React.getOTASettingsService()->read([&](OTASettings & settings) {
         node["enabled"] = settings.enabled;
         node["port"]    = settings.port;
@@ -1298,7 +1295,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
 #endif
 
     // MQTT Status
-    node                = output.createNestedObject("MQTT Info");
+    node                = output["MQTT Info"].to<JsonObject>();
     node["MQTT status"] = Mqtt::connected() ? F_(connected) : F_(disconnected);
     if (Mqtt::enabled()) {
         node["MQTT publishes"]     = Mqtt::publish_count();
@@ -1333,7 +1330,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
     });
 
     // Syslog Status
-    node            = output.createNestedObject("Syslog Info");
+    node            = output["Syslog Info"].to<JsonObject>();
     node["enabled"] = EMSESP::system_.syslog_enabled_;
 #ifndef EMSESP_STANDALONE
     if (EMSESP::system_.syslog_enabled_) {
@@ -1345,7 +1342,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
 #endif
 
     // Sensor Status
-    node = output.createNestedObject("Sensor Info");
+    node = output["Sensor Info"].to<JsonObject>();
     if (EMSESP::sensor_enabled()) {
         node["temperature sensors"]      = EMSESP::temperaturesensor_.no_sensors();
         node["temperature sensor reads"] = EMSESP::temperaturesensor_.reads();
@@ -1358,12 +1355,12 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
     }
 
     // API Status
-    node              = output.createNestedObject("API Info");
+    node              = output["API Info"].to<JsonObject>();
     node["API calls"] = WebAPIService::api_count();
     node["API fails"] = WebAPIService::api_fails();
 
     // EMS Bus Status
-    node = output.createNestedObject("Bus Info");
+    node = output["Bus Info"].to<JsonObject>();
     switch (EMSESP::bus_status()) {
     case EMSESP::BUS_STATUS_OFFLINE:
         node["bus status"] = "disconnected";
@@ -1391,7 +1388,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
     }
 
     // Settings
-    node = output.createNestedObject("Settings");
+    node = output["Settings"].to<JsonObject>();
     EMSESP::webSettingsService.read([&](WebSettings & settings) {
         node["board profile"] = settings.board_profile;
         node["locale"]        = settings.locale;
@@ -1432,11 +1429,11 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
 
     // Devices - show EMS devices if we have any
     if (!EMSESP::emsdevices.empty()) {
-        JsonArray devices = output.createNestedArray("Devices");
+        JsonArray devices = output["Devices"].to<JsonArray>();
         for (const auto & device_class : EMSFactory::device_handlers()) {
             for (const auto & emsdevice : EMSESP::emsdevices) {
                 if (emsdevice && (emsdevice->device_type() == device_class.first)) {
-                    JsonObject obj    = devices.createNestedObject();
+                    JsonObject obj    = devices.add<JsonObject>();
                     obj["type"]       = emsdevice->device_type_name(); // non translated name
                     obj["name"]       = emsdevice->name();
                     obj["device id"]  = Helpers::hextoa(emsdevice->device_id());
@@ -1471,7 +1468,7 @@ bool System::command_info(const char * value, const int8_t id, JsonObject & outp
 #if defined(EMSESP_TEST)
 // run a test, e.g. http://ems-esp/api?device=system&cmd=test&data=boiler
 bool System::command_test(const char * value, const int8_t id) {
-    return Test::run_test(value, id);
+    return Test::test(value, id);
 }
 #endif
 
diff --git a/src/system.h b/src/system.h
index bf8f5c237..ccff2ae71 100644
--- a/src/system.h
+++ b/src/system.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -57,10 +57,10 @@ class System {
     static bool command_restart(const char * value, const int8_t id);
     static bool command_syslog_level(const char * value, const int8_t id);
     static bool command_watch(const char * value, const int8_t id);
-    static bool command_info(const char * value, const int8_t id, JsonObject & output);
-    static bool command_commands(const char * value, const int8_t id, JsonObject & output);
-    static bool command_response(const char * value, const int8_t id, JsonObject & output);
-    static bool command_allvalues(const char * value, const int8_t id, JsonObject & output);
+    static bool command_info(const char * value, const int8_t id, JsonObject output);
+    static bool command_commands(const char * value, const int8_t id, JsonObject output);
+    static bool command_response(const char * value, const int8_t id, JsonObject output);
+    static bool command_allvalues(const char * value, const int8_t id, JsonObject output);
 
 #if defined(EMSESP_TEST)
     static bool command_test(const char * value, const int8_t id);
@@ -79,7 +79,7 @@ class System {
     void syslog_init();
     bool check_upgrade(bool factory_settings);
     bool check_restore();
-    bool heartbeat_json(JsonObject & output);
+    void heartbeat_json(JsonObject output);
     void send_heartbeat();
     void send_info_mqtt();
 
@@ -102,8 +102,8 @@ class System {
     void button_init(bool refresh);
     void commands_init();
 
-    static void extractSettings(const char * filename, const char * section, JsonObject & output);
-    static bool saveSettings(const char * filename, const char * section, JsonObject & input);
+    static void extractSettings(const char * filename, const char * section, JsonObject output);
+    static bool saveSettings(const char * filename, const char * section, JsonObject input);
 
     static bool is_valid_gpio(uint8_t pin);
     static bool load_board_profile(std::vector<int8_t> & data, const std::string & board_profile);
diff --git a/src/telegram.cpp b/src/telegram.cpp
index 03bdcd3e4..ac3da27c3 100644
--- a/src/telegram.cpp
+++ b/src/telegram.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/telegram.h b/src/telegram.h
index 28e12c630..fb047823d 100644
--- a/src/telegram.h
+++ b/src/telegram.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/temperaturesensor.cpp b/src/temperaturesensor.cpp
index 31c50599b..5746885bb 100644
--- a/src/temperaturesensor.cpp
+++ b/src/temperaturesensor.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,18 +49,18 @@ void TemperatureSensor::start() {
     Command::add(
         EMSdevice::DeviceType::TEMPERATURESENSOR,
         F_(info),
-        [&](const char * value, const int8_t id, JsonObject & output) { return command_info(value, id, output); },
+        [&](const char * value, const int8_t id, JsonObject output) { return command_info(value, id, output); },
         FL_(info_cmd));
     Command::add(
         EMSdevice::DeviceType::TEMPERATURESENSOR,
         F_(values),
-        [&](const char * value, const int8_t id, JsonObject & output) { return command_info(value, 0, output); },
+        [&](const char * value, const int8_t id, JsonObject output) { return command_info(value, 0, output); },
         nullptr,
         CommandFlag::HIDDEN); // this command is hidden
     Command::add(
         EMSdevice::DeviceType::TEMPERATURESENSOR,
         F_(commands),
-        [&](const char * value, const int8_t id, JsonObject & output) { return command_commands(value, id, output); },
+        [&](const char * value, const int8_t id, JsonObject output) { return command_commands(value, id, output); },
         FL_(commands_cmd));
 
     char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
@@ -108,11 +108,14 @@ void TemperatureSensor::loop() {
                     if (++scanretry_ > SCAN_MAX) { // every 30 sec
                         scanretry_ = 0;
 #ifdef EMSESP_DEBUG_SENSOR
-                        LOG_ERROR("Bus reset failed");
+                        LOG_DEBUG("Error: Bus reset failed");
 #endif
+#ifndef EMSESP_TEST
+                        // don't reset if running in test mode where we simulate sensors
                         for (auto & sensor : sensors_) {
                             sensor.temperature_c = EMS_VALUE_SHORT_NOTSET;
                         }
+#endif
                     }
                 }
             }
@@ -202,6 +205,7 @@ void TemperatureSensor::loop() {
                     bus_.depower();
                 }
                 // check for missing sensors after some samples
+                // but don't do this if running in test mode where we simulate sensors
                 if (++scancnt_ > SCAN_MAX) {
                     for (auto & sensor : sensors_) {
                         if (!sensor.read) {
@@ -309,6 +313,7 @@ bool TemperatureSensor::update(const std::string & id, const std::string & name,
             // if HA is enabled then delete the old record
             if (Mqtt::ha_enabled()) {
                 remove_ha_topic(id);
+                sensor.ha_registered = false; // force HA configs to be re-created
             }
 
             sensor.set_name(name);
@@ -357,13 +362,13 @@ bool TemperatureSensor::updated_values() {
 }
 
 // list commands
-bool TemperatureSensor::command_commands(const char * value, const int8_t id, JsonObject & output) {
+bool TemperatureSensor::command_commands(const char * value, const int8_t id, JsonObject output) {
     return Command::list(EMSdevice::DeviceType::TEMPERATURESENSOR, output);
 }
 
 // creates JSON doc from values
 // returns true if there are no sensors
-bool TemperatureSensor::command_info(const char * value, const int8_t id, JsonObject & output) {
+bool TemperatureSensor::command_info(const char * value, const int8_t id, JsonObject output) {
     if (sensors_.empty()) {
         return true;
     }
@@ -371,7 +376,7 @@ bool TemperatureSensor::command_info(const char * value, const int8_t id, JsonOb
     for (const auto & sensor : sensors_) {
         char val[10];
         if (id == -1) { // show number and id, info command
-            JsonObject dataSensor = output.createNestedObject(sensor.name());
+            JsonObject dataSensor = output[sensor.name()].to<JsonObject>();
             dataSensor["id"]      = sensor.id();
             dataSensor["uom"]     = EMSdevice::uom_to_string(DeviceValueUOM::DEGREES);
             dataSensor["type"]    = F_(number);
@@ -389,7 +394,7 @@ bool TemperatureSensor::command_info(const char * value, const int8_t id, JsonOb
 }
 
 // called from emsesp.cpp, similar to the emsdevice->get_value_info
-bool TemperatureSensor::get_value_info(JsonObject & output, const char * cmd, const int8_t id) {
+bool TemperatureSensor::get_value_info(JsonObject output, const char * cmd, const int8_t id) {
     if (sensors_.empty()) {
         return true;
     }
@@ -409,8 +414,8 @@ bool TemperatureSensor::get_value_info(JsonObject & output, const char * cmd, co
         if (Helpers::toLower(command_s) == Helpers::toLower(sensor.name().c_str()) || Helpers::toLower(command_s) == Helpers::toLower(sensor.id().c_str())) {
             output["id"]   = sensor.id();
             output["name"] = sensor.name();
-            char val[10];
             if (Helpers::hasValue(sensor.temperature_c)) {
+                char val[10];
                 output["value"] = serialized(Helpers::render_value(val, sensor.temperature_c, 10, EMSESP::system_.fahrenheit() ? 2 : 0));
             }
 
@@ -421,7 +426,7 @@ bool TemperatureSensor::get_value_info(JsonObject & output, const char * cmd, co
             // if we're filtering on an attribute, go find it
             if (attribute_s) {
                 if (output.containsKey(attribute_s)) {
-                    JsonVariant data = output[attribute_s];
+                    String data = output[attribute_s].as<String>();
                     output.clear();
                     output["api_data"] = data;
                     return true;
@@ -458,6 +463,7 @@ void TemperatureSensor::remove_ha_topic(const std::string & id) {
     if (!Mqtt::ha_enabled()) {
         return;
     }
+
     LOG_DEBUG("Removing HA config for temperature sensor ID %s", id.c_str());
     // use '_' as HA doesn't like '-' in the topic name
     std::string sensorid = id;
@@ -474,7 +480,6 @@ void TemperatureSensor::publish_values(const bool force) {
     }
 
     uint8_t num_sensors = sensors_.size();
-
     if (num_sensors == 0) {
         return;
     }
@@ -485,19 +490,19 @@ void TemperatureSensor::publish_values(const bool force) {
         }
     }
 
-    DynamicJsonDocument doc(120 * num_sensors);
+    JsonDocument doc;
 
     for (auto & sensor : sensors_) {
         bool has_value = Helpers::hasValue(sensor.temperature_c);
-        char val[10];
-        if (Mqtt::is_nested()) {
-            JsonObject dataSensor = doc.createNestedObject(sensor.id());
-            dataSensor["name"]    = sensor.name();
-            if (has_value) {
-                dataSensor["temp"] = serialized(Helpers::render_value(val, sensor.temperature_c, 10, EMSESP::system_.fahrenheit() ? 2 : 0));
+        if (has_value) {
+            char val[10];
+            if (Mqtt::is_nested()) {
+                JsonObject dataSensor = doc[sensor.id()].to<JsonObject>();
+                dataSensor["name"]    = sensor.name();
+                dataSensor["temp"]    = serialized(Helpers::render_value(val, sensor.temperature_c, 10, EMSESP::system_.fahrenheit() ? 2 : 0));
+            } else {
+                doc[sensor.name()] = serialized(Helpers::render_value(val, sensor.temperature_c, 10, EMSESP::system_.fahrenheit() ? 2 : 0));
             }
-        } else if (has_value) {
-            doc[sensor.name()] = serialized(Helpers::render_value(val, sensor.temperature_c, 10, EMSESP::system_.fahrenheit() ? 2 : 0));
         }
 
         // create the HA MQTT config
@@ -509,7 +514,7 @@ void TemperatureSensor::publish_values(const bool force) {
             } else if (!sensor.ha_registered || force) {
                 LOG_DEBUG("Recreating HA config for sensor ID %s", sensor.id().c_str());
 
-                StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> config;
+                JsonDocument config; // this needs to be large because of all the copying in add_ha_sections_to_doc()
                 config["dev_cla"] = "temperature";
 
                 char stat_t[50];
@@ -518,8 +523,8 @@ void TemperatureSensor::publish_values(const bool force) {
 
                 config["unit_of_meas"] = EMSdevice::uom_to_string(DeviceValueUOM::DEGREES);
 
-                char val_obj[50];
-                char val_cond[95];
+                char val_obj[70];
+                char val_cond[170];
                 if (Mqtt::is_nested()) {
                     snprintf(val_obj, sizeof(val_obj), "value_json['%s'].temp", sensor.id().c_str());
                     snprintf(val_cond, sizeof(val_cond), "value_json['%s'] is defined and %s is defined", sensor.id().c_str(), val_obj);
@@ -527,7 +532,14 @@ void TemperatureSensor::publish_values(const bool force) {
                     snprintf(val_obj, sizeof(val_obj), "value_json['%s']", sensor.name().c_str());
                     snprintf(val_cond, sizeof(val_cond), "%s is defined", val_obj);
                 }
-                config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + " else -55}}";
+
+                // for the value template, there's a problem still with Domoticz probably due to the special characters.
+                // See https://github.com/emsesp/EMS-ESP32/issues/1360
+                if (Mqtt::discovery_type() == Mqtt::discoveryType::HOMEASSISTANT) {
+                    config["val_tpl"] = (std::string) "{{" + val_obj + " if " + val_cond + " else -55}}";
+                } else {
+                    config["val_tpl"] = (std::string) "{{" + val_obj + "}}"; // ommit value conditional Jinja2 template code
+                }
 
                 char uniq_s[70];
                 if (Mqtt::entity_format() == Mqtt::entityFormat::MULTI_SHORT) {
@@ -543,13 +555,16 @@ void TemperatureSensor::publish_values(const bool force) {
                 snprintf(name, sizeof(name), "%s", sensor.name().c_str());
                 config["name"] = name;
 
-                JsonObject dev = config.createNestedObject("dev");
-                dev["name"]    = Mqtt::basename() + " Temperature";
-                JsonArray ids  = dev.createNestedArray("ids");
-                ids.add(Mqtt::basename() + "-temperature");
+                // see if we need to create the [devs] discovery section, as this needs only to be done once for all sensors
+                bool is_ha_device_created = false;
+                for (auto & sensor : sensors_) {
+                    if (sensor.ha_registered) {
+                        is_ha_device_created = true;
+                        break;
+                    }
+                }
 
-                // add "availability" section
-                Mqtt::add_avty_to_doc(stat_t, config.as<JsonObject>(), val_cond);
+                Mqtt::add_ha_sections_to_doc("temperature", stat_t, config, !is_ha_device_created, val_cond);
 
                 char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
                 // use '_' as HA doesn't like '-' in the topic name
@@ -568,7 +583,6 @@ void TemperatureSensor::publish_values(const bool force) {
     Mqtt::queue_publish(topic, doc.as<JsonObject>());
 }
 
-
 // skip crc from id
 TemperatureSensor::Sensor::Sensor(const uint8_t addr[])
     : internal_id_(((uint64_t)addr[0] << 48) | ((uint64_t)addr[1] << 40) | ((uint64_t)addr[2] << 32) | ((uint64_t)addr[3] << 24) | ((uint64_t)addr[4] << 16)
@@ -628,15 +642,17 @@ void TemperatureSensor::test() {
     // add 2 temperature sensors
     uint8_t addr[ADDR_LEN] = {1, 2, 3, 4, 5, 6, 7, 8};
     sensors_.emplace_back(addr);
+    // sensors_.back().apply_customization();
     sensors_.back().temperature_c = 123;
     sensors_.back().read          = true;
-    sensors_.back().apply_customization();
+    publish_sensor(sensors_.back()); // call publish single
 
     uint8_t addr2[ADDR_LEN] = {11, 12, 13, 14, 15, 16, 17, 18};
     sensors_.emplace_back(addr2);
+    // sensors_.back().apply_customization();
     sensors_.back().temperature_c = 456;
     sensors_.back().read          = true;
-    sensors_.back().apply_customization();
+    publish_sensor(sensors_.back()); // call publish single
 }
 #endif
 
diff --git a/src/temperaturesensor.h b/src/temperaturesensor.h
index 3d7363054..98d10066f 100644
--- a/src/temperaturesensor.h
+++ b/src/temperaturesensor.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,6 +62,7 @@ class TemperatureSensor {
 
         bool apply_customization();
 
+        // initial values
         int16_t temperature_c = EMS_VALUE_SHORT_NOTSET;
         bool    read          = false;
         bool    ha_registered = false;
@@ -82,7 +83,7 @@ class TemperatureSensor {
     void publish_values(const bool force);
     void reload();
     bool updated_values();
-    bool get_value_info(JsonObject & output, const char * cmd, const int8_t id);
+    bool get_value_info(JsonObject output, const char * cmd, const int8_t id);
 
     // return back reference to the sensor list, used by other classes
     std::vector<Sensor> sensors() const {
@@ -111,7 +112,7 @@ class TemperatureSensor {
 
     bool update(const std::string & id, const std::string & name, int16_t offset);
 
-    bool command_info(const char * value, const int8_t id, JsonObject & output);
+    bool command_info(const char * value, const int8_t id, JsonObject output);
 
 #if defined(EMSESP_TEST)
     void test();
@@ -154,7 +155,7 @@ class TemperatureSensor {
     uint64_t get_id(const uint8_t addr[]);
     void     remove_ha_topic(const std::string & id);
 
-    bool command_commands(const char * value, const int8_t id, JsonObject & output);
+    bool command_commands(const char * value, const int8_t id, JsonObject output);
 
     std::vector<Sensor> sensors_; // our list of active sensors
 
diff --git a/src/test/test.cpp b/src/test/test.cpp
index 2503eea88..48af75f6f 100644
--- a/src/test/test.cpp
+++ b/src/test/test.cpp
@@ -1,7 +1,6 @@
-
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
-* Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2023  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,12 +24,19 @@ namespace emsesp {
 
 // no shell, called via the API or 'call system test' command
 // or http://ems-esp/api?device=system&cmd=test&data=boiler
-bool Test::run_test(const char * command, int8_t id) {
-    if ((command == nullptr) || (strlen(command) == 0)) {
+bool Test::test(const std::string & cmd, int8_t id1, int8_t id2) {
+    if (cmd.empty()) {
         return false;
     }
 
-    if (strcmp(command, "memory") == 0) {
+    if (cmd == "add") {
+        Mqtt::entity_format(Mqtt::entityFormat::SINGLE_LONG); // SINGLE_LONG, SINGLE_SHORT, MULTI_SHORT
+        System::test_set_all_active(true);                    // include all entities and give them fake values
+        add_device(id1, id2);
+        return true;
+    }
+
+    if (cmd == "memory") {
         EMSESP::logger().notice("Testing memory by adding lots of devices and entities...");
 
         System::test_set_all_active(true); // include all entities and give them fake values
@@ -43,7 +49,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "general") == 0) {
+    if (cmd == "general") {
         EMSESP::logger().info("Testing general. Adding a Boiler and Thermostat");
 
         // System::test_set_all_active(true); // uncomment if we want to show all entities and give them fake values
@@ -77,7 +83,7 @@ bool Test::run_test(const char * command, int8_t id) {
 //
 #ifdef EMSESP_STANDALONE
 
-    if (strcmp(command, "heat_exchange") == 0) {
+    if (cmd == "heat_exchange") {
         EMSESP::logger().info("Testing heating exchange...");
 
         add_device(0x08, 219); // Greenstar HIU/Logamax kompakt WS170
@@ -89,7 +95,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "2thermostats") == 0) {
+    if (cmd == "2thermostats") {
         EMSESP::logger().info("Testing with multiple thermostats...");
 
         add_device(0x08, 123); // GB072
@@ -121,7 +127,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "310") == 0) {
+    if (cmd == "310") {
         EMSESP::logger().info("Adding a GB072/RC310 combo...");
 
         add_device(0x08, 123); // GB072
@@ -148,7 +154,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "gateway") == 0) {
+    if (cmd == "gateway") {
         EMSESP::logger().info("Adding a Gateway...");
 
         // add 0x48 KM200, via a version command
@@ -168,7 +174,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "mixer") == 0) {
+    if (cmd == "mixer") {
         EMSESP::logger().info("Adding a mixer...");
 
         // add controller
@@ -190,7 +196,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "boiler") == 0) {
+    if (cmd == "boiler") {
         EMSESP::logger().info("Adding boiler...");
         add_device(0x08, 123); // Nefit Trendline
 
@@ -207,7 +213,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "thermostat") == 0) {
+    if (cmd == "thermostat") {
         EMSESP::logger().info("Adding thermostat...");
 
         add_device(0x10, 192); // FW120
@@ -220,7 +226,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "solar") == 0) {
+    if (cmd == "solar") {
         EMSESP::logger().info("Adding solar...");
 
         add_device(0x30, 163); // SM100
@@ -239,7 +245,7 @@ bool Test::run_test(const char * command, int8_t id) {
         return true;
     }
 
-    if (strcmp(command, "heatpump") == 0) {
+    if (cmd == "heatpump") {
         EMSESP::logger().info("Adding heatpump...");
 
         add_device(0x38, 200); // Enviline module
@@ -258,11 +264,13 @@ bool Test::run_test(const char * command, int8_t id) {
 }
 
 // These next tests are run from the Consol via the test command, so inherit the Shell
-void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const std::string & data) {
+void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const std::string & id1_s, const std::string & id2_s) {
     shell.add_flags(CommandFlags::ADMIN); // switch to su
 
     // init stuff
     Mqtt::ha_enabled(true);
+    Mqtt::entity_format(Mqtt::entityFormat::SINGLE_SHORT); // SINGLE_LONG, SINGLE_SHORT, MULTI_SHORT
+
     EMSESP::rxservice_.ems_mask(EMSbus::EMS_MASK_BUDERUS);
 
     // EMSESP::watch(EMSESP::Watch::WATCH_RAW); // raw mode
@@ -275,18 +283,39 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         command = cmd;
     }
 
+    // extract params
+    int8_t id1 = -1;
+    int8_t id2 = -1;
+    if (!id1_s.empty()) {
+        if (id1_s[0] == '0' && id1_s[1] == 'x') {
+            id1 = Helpers::hextoint(id1_s.c_str());
+        } else {
+            id1 = Helpers::atoint(id1_s.c_str());
+        }
+    }
+    if (!id2_s.empty()) {
+        id2 = Helpers::atoint(id2_s.c_str());
+    }
+
     bool ok = false;
 
+    if (command == "add") {
+        shell.printfln("Testing Adding a device (product_id %d), with all values...", id2);
+        test("add", id1, id2); // e.g. 8 172
+        shell.invoke_command("show values");
+        ok = true;
+    }
+
     if (command == "general") {
         shell.printfln("Testing adding a boiler, thermostat and sensors...");
-        run_test("general");
+        test("general");
 
         // add sensors
         emsesp::EMSESP::analogsensor_.test();
         emsesp::EMSESP::temperaturesensor_.test();
 
         // shell.invoke_command("show devices");
-        shell.invoke_command("show values");
+        // shell.invoke_command("show values");
         shell.invoke_command("call system allvalues");
         // shell.invoke_command("call system publish");
         // shell.invoke_command("show mqtt");
@@ -296,14 +325,14 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
     // https://github.com/emsesp/EMS-ESP32/issues/869
     if (command == "memory") {
         shell.printfln("Testing memory by adding lots of devices and entities...");
-        run_test("memory");
+        test("memory");
         shell.invoke_command("show values");
         ok = true;
     }
 
     if (command == "custom_entities") {
         shell.printfln("custom entities...");
-        run_test("general");
+        test("general");
 
 #ifdef EMSESP_STANDALONE
         AsyncWebServerRequest request;
@@ -318,7 +347,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "coldshot") {
         shell.printfln("Testing coldshot...");
-        run_test("general");
+        test("general");
 
 #ifdef EMSESP_STANDALONE
         AsyncWebServerRequest request;
@@ -370,7 +399,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "modes") {
         shell.printfln("Testing thermostat modes...");
-        run_test("general");
+        test("general");
         shell.invoke_command("call thermostat mode auto");
         shell.invoke_command("call thermostat mode Manuell"); // DE
         shell.invoke_command("call thermostat mode 1");
@@ -506,13 +535,13 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "gateway") {
         shell.printfln("Testing Gateway...");
-        run_test("gateway");
+        test("gateway");
         ok = true;
     }
 
     if (command == "310") {
         shell.printfln("Testing RC310...");
-        run_test("310");
+        test("310");
         shell.invoke_command("show devices");
         shell.invoke_command("show values");
         shell.invoke_command("call system publish");
@@ -522,7 +551,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "heat_exchange") {
         shell.printfln("Testing heat exchange...");
-        run_test("heat_exchange");
+        test("heat_exchange");
         shell.invoke_command("show devices");
         shell.invoke_command("show values");
         ok = true;
@@ -530,7 +559,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "2thermostats") {
         shell.printfln("Testing multiple thermostats...");
-        run_test("2thermostats");
+        test("2thermostats");
         shell.invoke_command("show values");
         shell.invoke_command("show devices");
         ok = true;
@@ -542,10 +571,10 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::enabled(false);    // turn off mqtt
         Mqtt::ha_enabled(false); // turn off ha
 
-        run_test("boiler");
-        run_test("thermostat");
+        test("boiler");
+        test("thermostat");
 
-        DynamicJsonDocument doc(8000); // some absurd high number
+        JsonDocument doc; // some absurd high number
         for (const auto & emsdevice : EMSESP::emsdevices) {
             if (emsdevice) {
                 doc.clear();
@@ -570,8 +599,6 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
                 serializeJson(doc, Serial);
                 Serial.print(COLOR_RESET);
                 Serial.println();
-                Serial.print("** memoryUsage=");
-                Serial.print(doc.memoryUsage());
                 Serial.print(" measureMsgPack=");
                 Serial.print(measureMsgPack(doc));
                 Serial.print(" measureJson=");
@@ -598,7 +625,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::ha_enabled(true);
         Mqtt::nested_format(1);
 
-        run_test("boiler");
+        test("boiler");
         shell.invoke_command("show devices");
         shell.invoke_command("show values");
         shell.invoke_command("call boiler info");
@@ -624,7 +651,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
     if (command == "shower_alert") {
         shell.printfln("Testing Shower Alert...");
 
-        run_test("boiler");
+        test("boiler");
 
         // device type, command, data
         Command::call(EMSdevice::DeviceType::BOILER, "wwtapactivated", "false");
@@ -652,10 +679,10 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::nested_format(1); // is nested
         // Mqtt::nested_format(2); // not nested
 
-        run_test("boiler");
-        run_test("thermostat");
-        run_test("solar");
-        run_test("mixer");
+        test("boiler");
+        test("thermostat");
+        test("solar");
+        test("mixer");
 
         shell.invoke_command("call system publish");
         shell.invoke_command("show mqtt");
@@ -674,8 +701,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::nested_format(1);
         // Mqtt::send_response(false);
 
-        run_test("boiler");
-        // run_test("thermostat");
+        test("boiler");
+        // test("thermostat");
 
         // 0xC2
         //  [emsesp] Boiler(0x08) -> Me(0x0B), UBAErrorMessage3(0xC2), data: 08 AC 00 10 31 48 30 31 15 80 95 0B 0E 10 38 00 7F FF FF FF 08 AC 00 10 09 41 30
@@ -694,8 +721,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::nested_format(1);
         // Mqtt::send_response(false);
 
-        run_test("boiler");
-        run_test("thermostat");
+        test("boiler");
+        test("thermostat");
 
         shell.invoke_command("call boiler wwseltemp");
         shell.invoke_command("call system publish");
@@ -705,6 +732,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
     if (command == "temperature") {
         shell.printfln("Testing adding Temperature sensor");
         emsesp::EMSESP::temperaturesensor_.test();
+        shell.invoke_command("show values");
         ok = true;
     }
 
@@ -746,15 +774,13 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
     }
 
     if (command == "healthcheck") {
-        uint8_t n = 0;
-        if (!data.empty()) {
-            n = Helpers::atoint(data.c_str());
-        }
-
         // n=1 = EMSESP::system_.HEALTHCHECK_NO_BUS
         // n=2 = EMSESP::system_.HEALTHCHECK_NO_NETWORK
-        shell.printfln("Testing healthcheck with %d", n);
-        EMSESP::system_.healthcheck(n);
+        if (id1 == -1) {
+            id1 = 0;
+        }
+        shell.printfln("Testing healthcheck with %d", id1);
+        EMSESP::system_.healthcheck(id1);
         ok = true;
     }
 
@@ -764,7 +790,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::ha_enabled(true);
         // Mqtt::send_response(false);
 
-        run_test("thermostat");
+        test("thermostat");
 
         // shell.invoke_command("call thermostat seltemp");
         // shell.invoke_command("call system publish");
@@ -795,7 +821,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::ha_enabled(true);
         // Mqtt::send_response(false);
 
-        run_test("boiler");
+        test("boiler");
 
         shell.invoke_command("call boiler wwseltemp");
         shell.invoke_command("call system publish");
@@ -820,7 +846,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::ha_enabled(true);
         // Mqtt::send_response(false);
 
-        run_test("boiler");
+        test("boiler");
 
         shell.invoke_command("call boiler wwseltemp");
         shell.invoke_command("call system publish");
@@ -843,11 +869,11 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         // EMSESP::bool_format(BOOL_FORMAT_10); // BOOL_FORMAT_10_STR
         EMSESP::system_.bool_format(BOOL_FORMAT_TRUEFALSE); // BOOL_FORMAT_TRUEFALSE_STR
 
-        run_test("boiler");
-        run_test("thermostat");
+        test("boiler");
+        test("thermostat");
 
         AsyncWebServerRequest request;
-        DynamicJsonDocument   doc(2000);
+        JsonDocument          doc;
         JsonVariant           json;
         request.method(HTTP_GET);
 
@@ -876,8 +902,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         EMSESP::system_.bool_format(BOOL_FORMAT_10); // BOOL_FORMAT_10_STR
         // EMSESP::bool_format(BOOL_FORMAT_TRUEFALSE); // BOOL_FORMAT_TRUEFALSE_STR
 
-        run_test("boiler");
-        run_test("thermostat");
+        test("boiler");
+        test("thermostat");
 
         EMSESP::mqtt_.incoming("ems-esp/boiler/wwseltemp", "59");
         ok = true;
@@ -888,15 +914,15 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         shell.printfln("Testing API wwmode");
         Mqtt::ha_enabled(false);
         Mqtt::nested_format(1);
-        run_test("310");
+        test("310");
 
         AsyncWebServerRequest request;
         request.method(HTTP_POST);
-        DynamicJsonDocument doc(2000);
-        JsonVariant         json;
+        JsonDocument doc;
+        JsonVariant  json;
 
-        char data[] = "{\"value\":\"off\"}";
-        deserializeJson(doc, data);
+        char odata[] = "{\"value\":\"off\"}";
+        deserializeJson(doc, odata);
         json = doc.as<JsonVariant>();
         request.url("/api/thermostat/wwmode");
         EMSESP::webAPIService.webAPIService_post(&request, json);
@@ -912,11 +938,11 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         Mqtt::nested_format(1);
         // Mqtt::send_response(true);
 
-        run_test("boiler");
-        run_test("thermostat");
+        test("boiler");
+        test("thermostat");
 
         AsyncWebServerRequest requestX;
-        DynamicJsonDocument   docX(2000);
+        JsonDocument          docX;
         JsonVariant           jsonX;
 
         requestX.method(HTTP_GET);
@@ -1107,8 +1133,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
         // POST tests
         request.method(HTTP_POST);
-        DynamicJsonDocument doc(2000);
-        JsonVariant         json;
+        JsonDocument doc;
+        JsonVariant  json;
 
         // 1
         char data1[] = "{\"entity\":\"seltemp\",\"value\":11}";
@@ -1182,10 +1208,10 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         shell.printfln("Testing nested MQTT");
         Mqtt::ha_enabled(false); // turn off HA Discovery to stop the chatter
 
-        run_test("boiler");
-        run_test("thermostat");
-        run_test("solar");
-        run_test("mixer");
+        test("boiler");
+        test("thermostat");
+        test("solar");
+        test("mixer");
 
         // first with nested
         Mqtt::nested_format(1);
@@ -1202,7 +1228,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
     if (command == "thermostat") {
         shell.printfln("Testing adding a thermostat FW120...");
 
-        run_test("thermostat");
+        test("thermostat");
         shell.invoke_command("show values");
         shell.invoke_command("call system publish");
 
@@ -1230,7 +1256,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "solar") {
         shell.printfln("Testing Solar");
-        run_test("solar");
+        test("solar");
 
         uart_telegram("30 00 FF 0A 02 6A 04"); // SM100 pump on (1)sh
         EMSESP::show_device_values(shell);
@@ -1244,7 +1270,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "heatpump") {
         shell.printfln("Testing Heat Pump");
-        run_test("heatpump");
+        test("heatpump");
         shell.invoke_command("call");
         shell.invoke_command("call heatpump info");
         ok = true;
@@ -1535,7 +1561,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
     if (command == "mqtt2") {
         shell.printfln("Testing MQTT large payloads...");
 
-        DynamicJsonDocument doc(EMSESP_JSON_SIZE_XXXLARGE);
+        JsonDocument doc;
 
         char key[8];
         char value[8];
@@ -1548,7 +1574,6 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
         }
         doc.shrinkToFit();
         JsonObject jo = doc.as<JsonObject>();
-        shell.printfln("Size of JSON payload = %d", jo.memoryUsage());
         shell.printfln("Length of JSON payload = %d", measureJson(jo));
 
         Mqtt::queue_publish("test", jo);
@@ -1700,7 +1725,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
     if (command == "mixer") {
         shell.printfln("Testing Mixer...");
 
-        run_test("mixer");
+        test("mixer");
 
         // check for error "No telegram type handler found for ID 0x255 (src 0x20)"
         uart_telegram({0xA0, 0x00, 0xFF, 0x00, 0x01, 0x55, 0x00, 0x1A});
diff --git a/src/test/test.h b/src/test/test.h
index 1ae7a5a83..83caa6e84 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,6 +22,7 @@
 #define EMSESP_TEST_H
 
 #include "emsesp.h"
+
 #include <ESPAsyncWebServer.h>
 
 namespace emsesp {
@@ -58,11 +59,10 @@ namespace emsesp {
 // #define EMSESP_DEBUG_DEFAULT "custom_entities"
 // #define EMSESP_DEBUG_DEFAULT "heat_exchange"
 
-
 class Test {
   public:
-    static void run_test(uuid::console::Shell & shell, const std::string & command, const std::string & data = "");
-    static bool run_test(const char * command, int8_t id = 0);
+    static void run_test(uuid::console::Shell & shell, const std::string & command, const std::string & id1 = "", const std::string & id2 = "");
+    static bool test(const std::string & command, int8_t id1 = -1, int8_t id2 = -1);
     static void dummy_mqtt_commands(const char * message);
     static void rx_telegram(const std::vector<uint8_t> & data);
     static void uart_telegram(const std::vector<uint8_t> & rx_data);
diff --git a/src/uart/emsuart_esp32.cpp b/src/uart/emsuart_esp32.cpp
index d259ab03c..ad8c9da7c 100644
--- a/src/uart/emsuart_esp32.cpp
+++ b/src/uart/emsuart_esp32.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/uart/emsuart_esp32.h b/src/uart/emsuart_esp32.h
index e39ad91ba..ada397087 100644
--- a/src/uart/emsuart_esp32.h
+++ b/src/uart/emsuart_esp32.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/version.h b/src/version.h
index 00dde0570..761b8afef 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.6.5-test.7"
+#define EMSESP_APP_VERSION "3.6.5-test.10"
diff --git a/src/web/WebAPIService.cpp b/src/web/WebAPIService.cpp
index 5c340038c..e2e311c01 100644
--- a/src/web/WebAPIService.cpp
+++ b/src/web/WebAPIService.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@ uint16_t WebAPIService::api_fails_ = 0;
 
 WebAPIService::WebAPIService(AsyncWebServer * server, SecurityManager * securityManager)
     : _securityManager(securityManager)
-    , _apiHandler("/api", std::bind(&WebAPIService::webAPIService_post, this, _1, _2), 256) { // for POSTS, must use 'Content-Type: application/json' in header
-    server->on("/api", HTTP_GET, std::bind(&WebAPIService::webAPIService_get, this, _1));     // for GETS
+    , _apiHandler("/api", std::bind(&WebAPIService::webAPIService_post, this, _1, _2)) {  // for POSTS, must use 'Content-Type: application/json' in header
+    server->on("/api", HTTP_GET, std::bind(&WebAPIService::webAPIService_get, this, _1)); // for GETS
     server->addHandler(&_apiHandler);
 
     // for settings
@@ -45,15 +45,15 @@ WebAPIService::WebAPIService(AsyncWebServer * server, SecurityManager * security
 // GET /{device}/{entity}
 void WebAPIService::webAPIService_get(AsyncWebServerRequest * request) {
     // has no body JSON so create dummy as empty input object
-    StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> input_doc;
-    JsonObject                                 input = input_doc.to<JsonObject>();
+    JsonDocument input_doc;
+    JsonObject   input = input_doc.to<JsonObject>();
     parse(request, input);
 }
 
 // For HTTP POSTS with an optional JSON body
 // HTTP_POST | HTTP_PUT | HTTP_PATCH
 // POST /{device}[/{hc|id}][/{name}]
-void WebAPIService::webAPIService_post(AsyncWebServerRequest * request, JsonVariant & json) {
+void WebAPIService::webAPIService_post(AsyncWebServerRequest * request, JsonVariant json) {
     // if no body then treat it as a secure GET
     if (!json.is<JsonObject>()) {
         webAPIService_get(request);
@@ -67,7 +67,7 @@ void WebAPIService::webAPIService_post(AsyncWebServerRequest * request, JsonVari
 
 // parse the URL looking for query or path parameters
 // reporting back any errors
-void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject & input) {
+void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject input) {
     // check if the user has admin privileges (token is included and authorized)
     bool is_admin = false;
     EMSESP::webSettingsService.read([&](WebSettings & settings) {
@@ -106,13 +106,15 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject & input) {
     emsesp::EMSESP::system_.refreshHeapMem();
 
     // output json buffer
-    size_t buffer   = EMSESP_JSON_SIZE_XXXLARGE;
-    auto * response = new PrettyAsyncJsonResponse(false, buffer);
-    while (!response->getSize()) {
-        delete response;
-        buffer -= 1024;
-        response = new PrettyAsyncJsonResponse(false, buffer);
-    }
+    AsyncJsonResponse * response = new AsyncJsonResponse(false);
+
+    // add more mem if needed - won't be needed in ArduinoJson 7
+    // while (!response->getSize()) {
+    //     delete response;
+    //     buffer -= 1024;
+    //     response = new AsyncJsonResponse(false, buffer);
+    // }
+
     JsonObject output = response->getRoot();
 
     // call command
@@ -132,8 +134,8 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject & input) {
     // if we're returning single values, just sent as plain text
     // https://github.com/emsesp/EMS-ESP32/issues/462#issuecomment-1093877210
     if (output.containsKey("api_data")) {
-        JsonVariant data = output["api_data"];
-        request->send(200, "text/plain; charset=utf-8", data.as<String>());
+        String data = output["api_data"].as<String>();
+        request->send(200, "text/plain; charset=utf-8", data);
         api_count_++;
         delete response;
         return;
@@ -161,12 +163,12 @@ void WebAPIService::parse(AsyncWebServerRequest * request, JsonObject & input) {
 }
 
 void WebAPIService::getSettings(AsyncWebServerRequest * request) {
-    auto *     response = new AsyncJsonResponse(false, FS_BUFFER_SIZE);
+    auto *     response = new AsyncJsonResponse(false);
     JsonObject root     = response->getRoot();
 
     root["type"] = "settings";
 
-    JsonObject node = root.createNestedObject("System");
+    JsonObject node = root["System"].to<JsonObject>();
     node["version"] = EMSESP_APP_VERSION;
 
     System::extractSettings(NETWORK_SETTINGS_FILE, "Network", root);
@@ -182,7 +184,7 @@ void WebAPIService::getSettings(AsyncWebServerRequest * request) {
 }
 
 void WebAPIService::getCustomizations(AsyncWebServerRequest * request) {
-    auto *     response = new AsyncJsonResponse(false, FS_BUFFER_SIZE);
+    auto *     response = new AsyncJsonResponse(false);
     JsonObject root     = response->getRoot();
 
     root["type"] = "customizations";
@@ -194,7 +196,7 @@ void WebAPIService::getCustomizations(AsyncWebServerRequest * request) {
 }
 
 void WebAPIService::getSchedule(AsyncWebServerRequest * request) {
-    auto *     response = new AsyncJsonResponse(false, FS_BUFFER_SIZE);
+    auto *     response = new AsyncJsonResponse(false);
     JsonObject root     = response->getRoot();
 
     root["type"] = "schedule";
@@ -206,7 +208,7 @@ void WebAPIService::getSchedule(AsyncWebServerRequest * request) {
 }
 
 void WebAPIService::getEntities(AsyncWebServerRequest * request) {
-    auto *     response = new AsyncJsonResponse(false, FS_BUFFER_SIZE);
+    auto *     response = new AsyncJsonResponse(false);
     JsonObject root     = response->getRoot();
 
     root["type"] = "entities";
diff --git a/src/web/WebAPIService.h b/src/web/WebAPIService.h
index 2570317b5..aa8dd28cb 100644
--- a/src/web/WebAPIService.h
+++ b/src/web/WebAPIService.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@ class WebAPIService {
   public:
     WebAPIService(AsyncWebServer * server, SecurityManager * securityManager);
 
-    void webAPIService_post(AsyncWebServerRequest * request, JsonVariant & json); // for POSTs
-    void webAPIService_get(AsyncWebServerRequest * request);                      // for GETs
+    void webAPIService_post(AsyncWebServerRequest * request, JsonVariant json); // for POSTs
+    void webAPIService_get(AsyncWebServerRequest * request);                    // for GETs
 
     static uint32_t api_count() {
         return api_count_;
@@ -49,7 +49,7 @@ class WebAPIService {
     static uint32_t api_count_;
     static uint16_t api_fails_;
 
-    void parse(AsyncWebServerRequest * request, JsonObject & input);
+    void parse(AsyncWebServerRequest * request, JsonObject input);
 
     void getSettings(AsyncWebServerRequest * request);
     void getCustomizations(AsyncWebServerRequest * request);
diff --git a/src/web/WebCustomEntityService.cpp b/src/web/WebCustomEntityService.cpp
index 5400fcf6a..ea0b5ae55 100644
--- a/src/web/WebCustomEntityService.cpp
+++ b/src/web/WebCustomEntityService.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,7 +30,7 @@ WebCustomEntityService::WebCustomEntityService(AsyncWebServer * server, FS * fs,
                     EMSESP_CUSTOMENTITY_SERVICE_PATH,
                     securityManager,
                     AuthenticationPredicates::IS_AUTHENTICATED)
-    , _fsPersistence(WebCustomEntity::read, WebCustomEntity::update, this, fs, EMSESP_CUSTOMENTITY_FILE, FS_BUFFER_SIZE) {
+    , _fsPersistence(WebCustomEntity::read, WebCustomEntity::update, this, fs, EMSESP_CUSTOMENTITY_FILE) {
 }
 
 // load the settings when the service starts
@@ -42,12 +42,13 @@ void WebCustomEntityService::begin() {
 
 // this creates the entity file, saving it to the FS
 // and also calls when the Entity web page is refreshed
-void WebCustomEntity::read(WebCustomEntity & webEntity, JsonObject & root) {
-    JsonArray entity  = root.createNestedArray("entities");
+void WebCustomEntity::read(WebCustomEntity & webEntity, JsonObject root) {
+    JsonArray entity  = root["entities"].to<JsonArray>();
     uint8_t   counter = 0;
     for (const CustomEntityItem & entityItem : webEntity.customEntityItems) {
-        JsonObject ei    = entity.createNestedObject();
+        JsonObject ei    = entity.add<JsonObject>();
         ei["id"]         = counter++; // id is only used to render the table and must be unique
+        ei["ram"]        = entityItem.ram;
         ei["device_id"]  = entityItem.device_id;
         ei["type_id"]    = entityItem.type_id;
         ei["offset"]     = entityItem.offset;
@@ -62,7 +63,7 @@ void WebCustomEntity::read(WebCustomEntity & webEntity, JsonObject & root) {
 
 // call on initialization and also when the Entity web page is updated
 // this loads the data into the internal class
-StateUpdateResult WebCustomEntity::update(JsonObject & root, WebCustomEntity & webCustomEntity) {
+StateUpdateResult WebCustomEntity::update(JsonObject root, WebCustomEntity & webCustomEntity) {
 #ifdef EMSESP_STANDALONE
     // invoke some fake data for testing
     // clang-format off
@@ -70,10 +71,10 @@ StateUpdateResult WebCustomEntity::update(JsonObject & root, WebCustomEntity & w
     const char * json =
         "{\"entities\": [{\"id\":0,\"device_id\":8,\"type_id\":24,\"offset\":0,\"factor\":1,\"name\":\"boiler_flowtemp\",\"uom\":1,\"value_type\":1,\"writeable\":true}]}";
     // clang-format on
-    StaticJsonDocument<500> doc;
+    JsonDocument doc;
     deserializeJson(doc, json);
     root = doc.as<JsonObject>();
-    Serial.println(COLOR_BRIGHT_MAGENTA);
+    Serial.print(COLOR_BRIGHT_MAGENTA);
     Serial.print(" Using fake custom entity file: ");
     serializeJson(root, Serial);
     Serial.println(COLOR_RESET);
@@ -88,6 +89,7 @@ StateUpdateResult WebCustomEntity::update(JsonObject & root, WebCustomEntity & w
     if (root["entities"].is<JsonArray>()) {
         for (const JsonObject ei : root["entities"].as<JsonArray>()) {
             auto entityItem       = CustomEntityItem();
+            entityItem.ram        = ei["ram"] | 0;
             entityItem.device_id  = ei["device_id"]; // send as numeric, will be converted to string in web
             entityItem.type_id    = ei["type_id"];
             entityItem.offset     = ei["offset"];
@@ -96,6 +98,14 @@ StateUpdateResult WebCustomEntity::update(JsonObject & root, WebCustomEntity & w
             entityItem.uom        = ei["uom"];
             entityItem.value_type = ei["value_type"];
             entityItem.writeable  = ei["writeable"];
+            entityItem.data       = ei["value"].as<std::string>();
+            if (entityItem.ram == 1) {
+                entityItem.device_id  = 0;
+                entityItem.type_id    = 0;
+                entityItem.uom        = 0;
+                entityItem.value_type = DeviceValueType::STRING;
+                entityItem.writeable  = true;
+            }
 
             if (entityItem.value_type == DeviceValueType::BOOL) {
                 entityItem.value = EMS_VALUE_DEFAULT_BOOL;
@@ -107,7 +117,7 @@ StateUpdateResult WebCustomEntity::update(JsonObject & root, WebCustomEntity & w
                 entityItem.value = EMS_VALUE_DEFAULT_SHORT;
             } else if (entityItem.value_type == DeviceValueType::USHORT) {
                 entityItem.value = EMS_VALUE_DEFAULT_USHORT;
-            } else { // if (entityItem.value_type == DeviceValueType::ULONG || entityItem.value_type == DeviceValueType::TIME) {
+            } else if (entityItem.value_type == DeviceValueType::ULONG || entityItem.value_type == DeviceValueType::TIME) {
                 entityItem.value = EMS_VALUE_DEFAULT_ULONG;
             }
             if (entityItem.factor == 0) {
@@ -134,7 +144,9 @@ bool WebCustomEntityService::command_setvalue(const char * value, const std::str
     EMSESP::webCustomEntityService.read([&](WebCustomEntity & webEntity) { customEntityItems = &webEntity.customEntityItems; });
     for (CustomEntityItem & entityItem : *customEntityItems) {
         if (Helpers::toLower(entityItem.name) == Helpers::toLower(name)) {
-            if (entityItem.value_type == DeviceValueType::STRING) {
+            if (entityItem.ram == 1) {
+                entityItem.data = value;
+            } else if (entityItem.value_type == DeviceValueType::STRING) {
                 char telegram[84];
                 strlcpy(telegram, value, sizeof(telegram));
                 uint8_t data[EMS_MAX_TELEGRAM_LENGTH];
@@ -183,7 +195,7 @@ bool WebCustomEntityService::command_setvalue(const char * value, const std::str
 
 // output of a single value
 // if add_uom is true it will add the UOM string to the value
-void WebCustomEntityService::render_value(JsonObject & output, CustomEntityItem entity, const bool useVal, const bool web, const bool add_uom) {
+void WebCustomEntityService::render_value(JsonObject output, CustomEntityItem entity, const bool useVal, const bool web, const bool add_uom) {
     char        payload[12];
     std::string name = useVal ? "value" : entity.name;
     switch (entity.value_type) {
@@ -244,7 +256,7 @@ void WebCustomEntityService::render_value(JsonObject & output, CustomEntityItem
 
 // display all custom entities
 // adding each one, with UOM to a json object string
-void WebCustomEntityService::show_values(JsonObject & output) {
+void WebCustomEntityService::show_values(JsonObject output) {
     for (const CustomEntityItem & entity : *customEntityItems) {
         render_value(output, entity, false, false, true); // with add_uom
     }
@@ -252,7 +264,7 @@ void WebCustomEntityService::show_values(JsonObject & output) {
 
 
 // process json output for info/commands and value_info
-bool WebCustomEntityService::get_value_info(JsonObject & output, const char * cmd) {
+bool WebCustomEntityService::get_value_info(JsonObject output, const char * cmd) {
     EMSESP::webCustomEntityService.read([&](WebCustomEntity & webEntity) { customEntityItems = &webEntity.customEntityItems; });
     if (Helpers::toLower(cmd) == F_(commands)) {
         output[F_(info)]     = Helpers::translated_word(FL_(info_cmd));
@@ -274,7 +286,7 @@ bool WebCustomEntityService::get_value_info(JsonObject & output, const char * cm
         for (const CustomEntityItem & entity : *customEntityItems) {
             render_value(output, entity);
         }
-        return (output.size() != 0);
+        return true;
     }
 
     char command_s[30];
@@ -297,18 +309,20 @@ bool WebCustomEntityService::get_value_info(JsonObject & output, const char * cm
             output["readable"]  = true;
             output["writeable"] = entity.writeable;
             output["visible"]   = true;
-            output["device_id"] = Helpers::hextoa(entity.device_id);
-            output["type_id"]   = Helpers::hextoa(entity.type_id);
-            output["offset"]    = entity.offset;
-            if (entity.value_type != DeviceValueType::BOOL && entity.value_type != DeviceValueType::STRING) {
-                output["factor"] = entity.factor;
-            } else if (entity.value_type == DeviceValueType::STRING) {
-                output["bytes"] = (uint8_t)entity.factor;
+            if (entity.ram == 0) {
+                output["device_id"] = Helpers::hextoa(entity.device_id);
+                output["type_id"]   = Helpers::hextoa(entity.type_id);
+                output["offset"]    = entity.offset;
+                if (entity.value_type != DeviceValueType::BOOL && entity.value_type != DeviceValueType::STRING) {
+                    output["factor"] = entity.factor;
+                } else if (entity.value_type == DeviceValueType::STRING) {
+                    output["bytes"] = (uint8_t)entity.factor;
+                }
             }
             render_value(output, entity, true);
             if (attribute_s) {
                 if (output.containsKey(attribute_s)) {
-                    JsonVariant data = output[attribute_s];
+                    String data = output[attribute_s].as<String>();
                     output.clear();
                     output["api_data"] = data;
                     return true;
@@ -342,8 +356,8 @@ void WebCustomEntityService::publish_single(const CustomEntityItem & entity) {
     } else {
         snprintf(topic, sizeof(topic), "%s/%s", "custom_data", entity.name.c_str());
     }
-    StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc;
-    JsonObject                                 output = doc.to<JsonObject>();
+    JsonDocument doc;
+    JsonObject   output = doc.to<JsonObject>();
     render_value(output, entity, true);
     Mqtt::queue_publish(topic, output["value"].as<std::string>());
 }
@@ -353,9 +367,11 @@ void WebCustomEntityService::publish(const bool force) {
     if (force) {
         ha_registered_ = false;
     }
+
     if (!Mqtt::enabled()) {
         return;
     }
+
     EMSESP::webCustomEntityService.read([&](WebCustomEntity & webEntity) { customEntityItems = &webEntity.customEntityItems; });
     if (customEntityItems->size() == 0) {
         return;
@@ -366,15 +382,16 @@ void WebCustomEntityService::publish(const bool force) {
         }
     }
 
-    DynamicJsonDocument doc(EMSESP_JSON_SIZE_XLARGE);
-    JsonObject          output     = doc.to<JsonObject>();
-    bool                ha_created = ha_registered_;
+    JsonDocument doc;
+    JsonObject   output     = doc.to<JsonObject>();
+    bool         ha_created = ha_registered_;
+
     for (const CustomEntityItem & entityItem : *customEntityItems) {
         render_value(output, entityItem);
         // create HA config
         if (Mqtt::ha_enabled() && !ha_registered_) {
-            StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> config;
-            char                                        stat_t[50];
+            JsonDocument config;
+            char         stat_t[50];
             snprintf(stat_t, sizeof(stat_t), "%s/custom_data", Mqtt::base().c_str());
             config["stat_t"] = stat_t;
 
@@ -392,12 +409,13 @@ void WebCustomEntityService::publish(const bool force) {
             config["name"]    = entityItem.name.c_str();
 
             char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
+
             if (entityItem.writeable) {
                 if (entityItem.value_type == DeviceValueType::BOOL) {
                     snprintf(topic, sizeof(topic), "switch/%s/custom_%s/config", Mqtt::basename().c_str(), entityItem.name.c_str());
                 } else if (entityItem.value_type == DeviceValueType::STRING) {
                     snprintf(topic, sizeof(topic), "sensor/%s/custom_%s/config", Mqtt::basename().c_str(), entityItem.name.c_str());
-                } else if (Mqtt::discovery_type() == Mqtt::discoveryType::HOMEASSISTANT) {
+                } else if (Mqtt::discovery_type() == Mqtt::discoveryType::HOMEASSISTANT || Mqtt::discovery_type() == Mqtt::discoveryType::DOMOTICZ_LATEST) {
                     snprintf(topic, sizeof(topic), "number/%s/custom_%s/config", Mqtt::basename().c_str(), entityItem.name.c_str());
                 } else {
                     snprintf(topic, sizeof(topic), "sensor/%s/custom_%s/config", Mqtt::basename().c_str(), entityItem.name.c_str());
@@ -412,6 +430,7 @@ void WebCustomEntityService::publish(const bool force) {
                     snprintf(topic, sizeof(topic), "sensor/%s/custom_%s/config", Mqtt::basename().c_str(), entityItem.name.c_str());
                 }
             }
+
             if (entityItem.value_type == DeviceValueType::BOOL) {
                 // applies to both Binary Sensor (read only) and a Switch (for a command)
                 if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
@@ -426,16 +445,13 @@ void WebCustomEntityService::publish(const bool force) {
                     config["pl_off"] = Helpers::render_boolean(result, false);
                 }
             }
-            JsonObject dev = config.createNestedObject("dev");
-            dev["name"]    = Mqtt::basename() + " Custom";
-            JsonArray ids  = dev.createNestedArray("ids");
-            ids.add(Mqtt::basename() + "-custom");
 
-            // add "availability" section
-            Mqtt::add_avty_to_doc(stat_t, config.as<JsonObject>(), val_cond);
+            Mqtt::add_ha_sections_to_doc("custom", stat_t, config, !ha_created, val_cond);
+
             ha_created |= Mqtt::queue_ha(topic, config.as<JsonObject>());
         }
     }
+
     ha_registered_ = ha_created;
     if (output.size() > 0) {
         Mqtt::queue_publish("custom_data", output);
@@ -450,9 +466,9 @@ uint8_t WebCustomEntityService::count_entities() {
         return 0;
     }
 
-    DynamicJsonDocument doc(EMSESP_JSON_SIZE_XLARGE);
-    JsonObject          output = doc.to<JsonObject>();
-    uint8_t             count  = 0;
+    JsonDocument doc;
+    JsonObject   output = doc.to<JsonObject>();
+    uint8_t      count  = 0;
     for (const CustomEntityItem & entity : *customEntityItems) {
         render_value(output, entity);
         count += (output.containsKey(entity.name) || entity.writeable) ? 1 : 0;
@@ -470,14 +486,14 @@ uint8_t WebCustomEntityService::has_commands() {
 }
 
 // send to dashboard, msgpack don't like serialized, use number
-void WebCustomEntityService::generate_value_web(JsonObject & output) {
+void WebCustomEntityService::generate_value_web(JsonObject output) {
     EMSESP::webCustomEntityService.read([&](WebCustomEntity & webEntity) { customEntityItems = &webEntity.customEntityItems; });
 
     output["label"] = (std::string) "Custom Entities";
-    JsonArray data  = output.createNestedArray("data");
+    JsonArray data  = output["data"].to<JsonArray>();
     uint8_t   index = 0;
     for (const CustomEntityItem & entity : *customEntityItems) {
-        JsonObject obj = data.createNestedObject(); // create the object, we know there is a value
+        JsonObject obj = data.add<JsonObject>(); // create the object, we know there is a value
         obj["id"]      = "00" + entity.name;
         obj["u"]       = entity.uom;
         if (entity.writeable) {
@@ -492,7 +508,7 @@ void WebCustomEntityService::generate_value_web(JsonObject & output) {
         case DeviceValueType::BOOL: {
             char s[12];
             obj["v"]    = Helpers::render_boolean(s, (uint8_t)entity.value, true);
-            JsonArray l = obj.createNestedArray("l");
+            JsonArray l = obj["l"].to<JsonArray>();
             l.add(Helpers::render_boolean(s, false, true));
             l.add(Helpers::render_boolean(s, true, true));
             break;
@@ -545,10 +561,21 @@ void WebCustomEntityService::fetch() {
     EMSESP::webCustomEntityService.read([&](WebCustomEntity & webEntity) { customEntityItems = &webEntity.customEntityItems; });
     const uint8_t len[] = {1, 1, 1, 2, 2, 3, 3};
     for (auto & entity : *customEntityItems) {
-        EMSESP::send_read_request(entity.type_id,
-                                  entity.device_id,
-                                  entity.offset,
-                                  entity.value_type == DeviceValueType::STRING ? (uint8_t)entity.factor : len[entity.value_type]);
+        if (entity.device_id > 0 && entity.type_id > 0) { // ths excludes also RAM type
+            bool needFetch = true;
+            for (const auto & emsdevice : EMSESP::emsdevices) {
+                if (entity.value_type != DeviceValueType::STRING && emsdevice->is_device_id(entity.device_id) && emsdevice->is_fetch(entity.type_id)) {
+                    needFetch = false;
+                    break;
+                }
+            }
+            if (needFetch) {
+                EMSESP::send_read_request(entity.type_id,
+                                          entity.device_id,
+                                          entity.offset,
+                                          entity.value_type == DeviceValueType::STRING ? (uint8_t)entity.factor : len[entity.value_type]);
+            }
+        }
     }
     // EMSESP::logger().debug("fetch custom entities");
 }
@@ -561,8 +588,8 @@ bool WebCustomEntityService::get_value(std::shared_ptr<const Telegram> telegram)
     const uint8_t len[] = {1, 1, 1, 2, 2, 3, 3};
     for (auto & entity : *customEntityItems) {
         if (entity.value_type == DeviceValueType::STRING && telegram->type_id == entity.type_id && telegram->src == entity.device_id
-            && telegram->offset == entity.offset) {
-            auto data = Helpers::data_to_hex(telegram->message_data, telegram->message_length);
+            && telegram->offset <= entity.offset && (telegram->offset + telegram->message_length) >= (entity.offset + (uint8_t)entity.factor)) {
+            auto data = Helpers::data_to_hex(telegram->message_data, (uint8_t)entity.factor);
             if (entity.data != data) {
                 entity.data = data;
                 if (Mqtt::publish_single()) {
@@ -571,9 +598,8 @@ bool WebCustomEntityService::get_value(std::shared_ptr<const Telegram> telegram)
                     has_change = true;
                 }
             }
-        }
-        if (entity.value_type != DeviceValueType::STRING && telegram->type_id == entity.type_id && telegram->src == entity.device_id
-            && telegram->offset <= entity.offset && (telegram->offset + telegram->message_length) >= (entity.offset + len[entity.value_type])) {
+        } else if (entity.value_type != DeviceValueType::STRING && telegram->type_id == entity.type_id && telegram->src == entity.device_id
+                   && telegram->offset <= entity.offset && (telegram->offset + telegram->message_length) >= (entity.offset + len[entity.value_type])) {
             uint32_t value = 0;
             for (uint8_t i = 0; i < len[entity.value_type]; i++) {
                 value = (value << 8) + telegram->message_data[i + entity.offset - telegram->offset];
diff --git a/src/web/WebCustomEntityService.h b/src/web/WebCustomEntityService.h
index 1b18e2073..228cd95c6 100644
--- a/src/web/WebCustomEntityService.h
+++ b/src/web/WebCustomEntityService.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 #define WebCustomEntityService_h
 
 #define EMSESP_CUSTOMENTITY_FILE "/config/emsespEntity.json"
-#define EMSESP_CUSTOMENTITY_SERVICE_PATH "/rest/customentities" // GET and POST
+#define EMSESP_CUSTOMENTITY_SERVICE_PATH "/rest/customEntities" // GET and POST
 
 namespace emsesp {
 
@@ -38,14 +38,15 @@ class CustomEntityItem {
     bool        writeable;
     uint32_t    value;
     std::string data;
+    uint8_t ram;
 };
 
 class WebCustomEntity {
   public:
     std::list<CustomEntityItem> customEntityItems;
 
-    static void              read(WebCustomEntity & webEntity, JsonObject & root);
-    static StateUpdateResult update(JsonObject & root, WebCustomEntity & webEntity);
+    static void              read(WebCustomEntity & webEntity, JsonObject root);
+    static StateUpdateResult update(JsonObject root, WebCustomEntity & webEntity);
 };
 
 class WebCustomEntityService : public StatefulService<WebCustomEntity> {
@@ -56,12 +57,12 @@ class WebCustomEntityService : public StatefulService<WebCustomEntity> {
     void publish_single(const CustomEntityItem & entity);
     void publish(const bool force = false);
     bool command_setvalue(const char * value, const std::string name);
-    bool get_value_info(JsonObject & output, const char * cmd);
+    bool get_value_info(JsonObject output, const char * cmd);
     bool get_value(std::shared_ptr<const Telegram> telegram);
     void fetch();
-    void render_value(JsonObject & output, CustomEntityItem entity, const bool useVal = false, const bool web = false, const bool add_uom = false);
-    void show_values(JsonObject & output);
-    void generate_value_web(JsonObject & output);
+    void render_value(JsonObject output, CustomEntityItem entity, const bool useVal = false, const bool web = false, const bool add_uom = false);
+    void show_values(JsonObject output);
+    void generate_value_web(JsonObject output);
 
     uint8_t count_entities();
     uint8_t has_commands();
diff --git a/src/web/WebCustomizationService.cpp b/src/web/WebCustomizationService.cpp
index d6a8b8e08..61e9f18db 100644
--- a/src/web/WebCustomizationService.cpp
+++ b/src/web/WebCustomizationService.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -25,14 +25,7 @@ using namespace std::placeholders; // for `_1` etc
 bool WebCustomization::_start = true;
 
 WebCustomizationService::WebCustomizationService(AsyncWebServer * server, FS * fs, SecurityManager * securityManager)
-    : _httpEndpoint(WebCustomization::read,
-                    WebCustomization::update,
-                    this,
-                    server,
-                    EMSESP_CUSTOMIZATION_SERVICE_PATH,
-                    securityManager,
-                    AuthenticationPredicates::IS_AUTHENTICATED)
-    , _fsPersistence(WebCustomization::read, WebCustomization::update, this, fs, EMSESP_CUSTOMIZATION_FILE)
+    : _fsPersistence(WebCustomization::read, WebCustomization::update, this, fs, EMSESP_CUSTOMIZATION_FILE)
     , _masked_entities_handler(CUSTOMIZATION_ENTITIES_PATH,
                                securityManager->wrapCallback(std::bind(&WebCustomizationService::customization_entities, this, _1, _2),
                                                              AuthenticationPredicates::IS_AUTHENTICATED)) {
@@ -51,25 +44,25 @@ WebCustomizationService::WebCustomizationService(AsyncWebServer * server, FS * f
 
     _masked_entities_handler.setMethod(HTTP_POST);
     _masked_entities_handler.setMaxContentLength(2048);
-    _masked_entities_handler.setMaxJsonBufferSize(2048);
     server->addHandler(&_masked_entities_handler);
 }
 
 // this creates the customization file, saving it to the FS
-void WebCustomization::read(WebCustomization & customizations, JsonObject & root) {
+void WebCustomization::read(WebCustomization & customizations, JsonObject root) {
     // Temperature Sensor customization
-    JsonArray sensorsJson = root.createNestedArray("ts");
+    JsonArray sensorsJson = root["ts"].to<JsonArray>();
+
     for (const SensorCustomization & sensor : customizations.sensorCustomizations) {
-        JsonObject sensorJson = sensorsJson.createNestedObject();
+        JsonObject sensorJson = sensorsJson.add<JsonObject>();
         sensorJson["id"]      = sensor.id;     // ID of chip
         sensorJson["name"]    = sensor.name;   // n
         sensorJson["offset"]  = sensor.offset; // o
     }
 
     // Analog Sensor customization
-    JsonArray analogJson = root.createNestedArray("as");
+    JsonArray analogJson = root["as"].to<JsonArray>();
     for (const AnalogCustomization & sensor : customizations.analogCustomizations) {
-        JsonObject sensorJson = analogJson.createNestedObject();
+        JsonObject sensorJson = analogJson.add<JsonObject>();
         sensorJson["gpio"]    = sensor.gpio;   // g
         sensorJson["name"]    = sensor.name;   // n
         sensorJson["offset"]  = sensor.offset; // o
@@ -79,14 +72,14 @@ void WebCustomization::read(WebCustomization & customizations, JsonObject & root
     }
 
     // Masked entities customization
-    JsonArray masked_entitiesJson = root.createNestedArray("masked_entities");
+    JsonArray masked_entitiesJson = root["masked_entities"].to<JsonArray>();
     for (const EntityCustomization & entityCustomization : customizations.entityCustomizations) {
-        JsonObject entityJson    = masked_entitiesJson.createNestedObject();
+        JsonObject entityJson    = masked_entitiesJson.add<JsonObject>();
         entityJson["product_id"] = entityCustomization.product_id;
         entityJson["device_id"]  = entityCustomization.device_id;
 
-        // entries are in the form <XX><shortname>[|optional customname] e.g "08heatingactive|heating is on"
-        JsonArray masked_entityJson = entityJson.createNestedArray("entity_ids");
+        // entries are in the form <XX><shortname>[optional customname] e.g "08heatingactive|heating is on"
+        JsonArray masked_entityJson = entityJson["entity_ids"].to<JsonArray>();
         for (std::string entity_id : entityCustomization.entity_ids) {
             masked_entityJson.add(entity_id);
         }
@@ -95,15 +88,15 @@ void WebCustomization::read(WebCustomization & customizations, JsonObject & root
 
 // call on initialization and also when the page is saved via web UI
 // this loads the data into the internal class
-StateUpdateResult WebCustomization::update(JsonObject & root, WebCustomization & customizations) {
+StateUpdateResult WebCustomization::update(JsonObject root, WebCustomization & customizations) {
 #ifdef EMSESP_STANDALONE
     // invoke some fake data for testing
-    const char *            json = "{\"ts\":[],\"as\":[],\"masked_entities\":[{\"product_id\":123,\"device_id\":8,\"entity_ids\":[\"08heatingactive|my custom "
-                                   "name for heating active (HS1)\",\"08tapwateractive\"]}]}";
-    StaticJsonDocument<500> doc;
+    const char * json = "{\"ts\":[],\"as\":[],\"masked_entities\":[{\"product_id\":123,\"device_id\":8,\"entity_ids\":[\"08heatingactive|my custom "
+                        "name for heating active (HS1)\",\"08tapwateractive\"]}]}";
+    JsonDocument doc;
     deserializeJson(doc, json);
     root = doc.as<JsonObject>();
-    Serial.println(COLOR_BRIGHT_MAGENTA);
+    Serial.print(COLOR_BRIGHT_MAGENTA);
     Serial.print(" Using fake customization file: ");
     serializeJson(root, Serial);
     Serial.println(COLOR_RESET);
@@ -179,15 +172,15 @@ void WebCustomizationService::reset_customization(AsyncWebServerRequest * reques
 
 // send back a list of devices used in the customization web page
 void WebCustomizationService::devices(AsyncWebServerRequest * request) {
-    auto *     response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_XLARGE);
+    auto *     response = new AsyncJsonResponse(false);
     JsonObject root     = response->getRoot();
 
     // list is already sorted by device type
     // controller is ignored since it doesn't have any associated entities
-    JsonArray devices = root.createNestedArray("devices");
+    JsonArray devices = root["devices"].to<JsonArray>();
     for (const auto & emsdevice : EMSESP::emsdevices) {
         if (emsdevice->has_entities()) {
-            JsonObject obj = devices.createNestedObject();
+            JsonObject obj = devices.add<JsonObject>();
             obj["i"]       = emsdevice->unique_id();                                                                     // its unique id
             obj["s"]  = std::string(emsdevice->device_type_2_device_name_translated()) + " (" + emsdevice->name() + ")"; // shortname, is device type translated
             obj["tn"] = emsdevice->device_type_name();                                                                   // non-translated, lower-case
@@ -205,14 +198,14 @@ void WebCustomizationService::device_entities(AsyncWebServerRequest * request) {
     if (request->hasParam(F_(id))) {
         id = Helpers::atoint(request->getParam(F_(id))->value().c_str()); // get id from url
 
-        size_t buffer   = EMSESP_JSON_SIZE_XXXXLARGE;
-        auto * response = new MsgpackAsyncJsonResponse(true, buffer);
+        auto * response = new MsgpackAsyncJsonResponse(true);
+
+        // while (!response) {
+        //     delete response;
+        //     buffer -= 1024;
+        //     response = new MsgpackAsyncJsonResponse(true, buffer);
+        // }
 
-        while (!response) {
-            delete response;
-            buffer -= 1024;
-            response = new MsgpackAsyncJsonResponse(true, buffer);
-        }
         for (const auto & emsdevice : EMSESP::emsdevices) {
             if (emsdevice->unique_id() == id) {
 #ifndef EMSESP_STANDALONE
@@ -239,7 +232,7 @@ void WebCustomizationService::device_entities(AsyncWebServerRequest * request) {
 // takes a list of updated entities with new masks from the web UI
 // saves it in the customization service
 // and updates the entity list real-time
-void WebCustomizationService::customization_entities(AsyncWebServerRequest * request, JsonVariant & json) {
+void WebCustomizationService::customization_entities(AsyncWebServerRequest * request, JsonVariant json) {
     bool need_reboot = false;
     if (json.is<JsonObject>()) {
         // find the device using the unique_id
diff --git a/src/web/WebCustomizationService.h b/src/web/WebCustomizationService.h
index 5044c0005..8ec322b71 100644
--- a/src/web/WebCustomizationService.h
+++ b/src/web/WebCustomizationService.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,6 @@
 
 // GET
 #define DEVICES_SERVICE_PATH "/rest/devices"
-#define EMSESP_CUSTOMIZATION_SERVICE_PATH "/rest/customization"
 #define DEVICE_ENTITIES_PATH "/rest/deviceEntities"
 
 // POST
@@ -71,8 +70,8 @@ class WebCustomization {
     std::list<SensorCustomization> sensorCustomizations; // for sensor names and offsets
     std::list<AnalogCustomization> analogCustomizations; // for analog sensors
     std::list<EntityCustomization> entityCustomizations; // for a list of entities that have a special mask set
-    static void                    read(WebCustomization & customizations, JsonObject & root);
-    static StateUpdateResult       update(JsonObject & root, WebCustomization & customizations);
+    static void                    read(WebCustomization & customizations, JsonObject root);
+    static StateUpdateResult       update(JsonObject root, WebCustomization & customizations);
 
   private:
     static bool _start;
@@ -89,7 +88,6 @@ class WebCustomizationService : public StatefulService<WebCustomization> {
   private:
 #endif
 
-    HttpEndpoint<WebCustomization>  _httpEndpoint;
     FSPersistence<WebCustomization> _fsPersistence;
 
     // GET
@@ -97,7 +95,7 @@ class WebCustomizationService : public StatefulService<WebCustomization> {
     void device_entities(AsyncWebServerRequest * request);
 
     // POST
-    void customization_entities(AsyncWebServerRequest * request, JsonVariant & json);
+    void customization_entities(AsyncWebServerRequest * request, JsonVariant json);
     void reset_customization(AsyncWebServerRequest * request); // command
 
     AsyncCallbackJsonWebHandler _masked_entities_handler;
diff --git a/src/web/WebDataService.cpp b/src/web/WebDataService.cpp
index aaa223b76..f1f8ab1b4 100644
--- a/src/web/WebDataService.cpp
+++ b/src/web/WebDataService.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,15 +71,15 @@ void WebDataService::scan_devices(AsyncWebServerRequest * request) {
 // this is used in the dashboard and contains all ems device information
 // /coreData endpoint
 void WebDataService::core_data(AsyncWebServerRequest * request) {
-    auto *     response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_XXLARGE);
+    auto *     response = new AsyncJsonResponse(false);
     JsonObject root     = response->getRoot();
 
     // list is already sorted by device type
-    JsonArray devices = root.createNestedArray("devices");
+    JsonArray devices = root["devices"].to<JsonArray>();
     for (const auto & emsdevice : EMSESP::emsdevices) {
         // ignore controller
         if (emsdevice && (emsdevice->device_type() != EMSdevice::DeviceType::CONTROLLER || emsdevice->count_entities() > 0)) {
-            JsonObject obj = devices.createNestedObject();
+            JsonObject obj = devices.add<JsonObject>();
             obj["id"]      = emsdevice->unique_id();                            // a unique id
             obj["tn"]      = emsdevice->device_type_2_device_name_translated(); // translated device type name
             obj["t"]       = emsdevice->device_type();                          // device type number
@@ -95,7 +95,7 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
     // add any custom entities
     uint8_t customEntities = EMSESP::webCustomEntityService.count_entities();
     if (customEntities) {
-        JsonObject obj = devices.createNestedObject();
+        JsonObject obj = devices.add<JsonObject>();
         obj["id"]      = 99;                                                // the last unique id
         obj["tn"]      = Helpers::translated_word(FL_(custom_device));      // translated device type name
         obj["t"]       = EMSdevice::DeviceType::CUSTOM;                     // device type number
@@ -116,14 +116,14 @@ void WebDataService::core_data(AsyncWebServerRequest * request) {
 // sensor data - sends back to web
 // /sensorData endpoint
 void WebDataService::sensor_data(AsyncWebServerRequest * request) {
-    auto *     response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_XXLARGE);
+    auto *     response = new AsyncJsonResponse(false);
     JsonObject root     = response->getRoot();
 
     // temperature sensors
-    JsonArray sensors = root.createNestedArray("ts");
+    JsonArray sensors = root["ts"].to<JsonArray>();
     if (EMSESP::temperaturesensor_.have_sensors()) {
         for (const auto & sensor : EMSESP::temperaturesensor_.sensors()) {
-            JsonObject obj = sensors.createNestedObject();
+            JsonObject obj = sensors.add<JsonObject>();
             obj["id"]      = sensor.id();   // id as string
             obj["n"]       = sensor.name(); // name
             if (EMSESP::system_.fahrenheit()) {
@@ -143,11 +143,11 @@ void WebDataService::sensor_data(AsyncWebServerRequest * request) {
     }
 
     // analog sensors
-    JsonArray analogs = root.createNestedArray("as");
+    JsonArray analogs = root["as"].to<JsonArray>();
     if (EMSESP::analog_enabled() && EMSESP::analogsensor_.have_sensors()) {
         uint8_t count = 0;
         for (const auto & sensor : EMSESP::analogsensor_.sensors()) {
-            JsonObject obj = analogs.createNestedObject();
+            JsonObject obj = analogs.add<JsonObject>();
             obj["id"]      = ++count; // needed for sorting table
             obj["g"]       = sensor.gpio();
             obj["n"]       = sensor.name();
@@ -178,15 +178,14 @@ void WebDataService::device_data(AsyncWebServerRequest * request) {
     if (request->hasParam(F_(id))) {
         id = Helpers::atoint(request->getParam(F_(id))->value().c_str()); // get id from url
 
-        size_t buffer   = EMSESP_JSON_SIZE_XXXXLARGE;
-        auto * response = new MsgpackAsyncJsonResponse(false, buffer);
+        auto * response = new MsgpackAsyncJsonResponse(false);
 
         // check size
-        while (!response) {
-            delete response;
-            buffer -= 1024;
-            response = new MsgpackAsyncJsonResponse(false, buffer);
-        }
+        // while (!response) {
+        //     delete response;
+        //     buffer -= 1024;
+        //     response = new MsgpackAsyncJsonResponse(false, buffer);
+        // }
 
         for (const auto & emsdevice : EMSESP::emsdevices) {
             if (emsdevice->unique_id() == id) {
@@ -228,7 +227,7 @@ void WebDataService::device_data(AsyncWebServerRequest * request) {
 }
 
 // assumes the service has been checked for admin authentication
-void WebDataService::write_device_value(AsyncWebServerRequest * request, JsonVariant & json) {
+void WebDataService::write_device_value(AsyncWebServerRequest * request, JsonVariant json) {
     if (json.is<JsonObject>()) {
         uint8_t      unique_id = json["id"]; // unique ID
         const char * cmd       = json["c"];  // the command
@@ -249,7 +248,7 @@ void WebDataService::write_device_value(AsyncWebServerRequest * request, JsonVar
                 cmd       = Command::parse_command_string(cmd, id); // extract hc or wwc
 
                 // create JSON for output
-                auto *     response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_SMALL);
+                auto *     response = new AsyncJsonResponse(false);
                 JsonObject output   = response->getRoot();
 
                 // the data could be in any format, but we need string
@@ -289,7 +288,7 @@ void WebDataService::write_device_value(AsyncWebServerRequest * request, JsonVar
             // parse the command as it could have a hc or wwc prefixed, e.g. hc2/seltemp
             int8_t id              = -1;
             cmd                    = Command::parse_command_string(cmd, id);
-            auto *     response    = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_SMALL);
+            auto *     response    = new AsyncJsonResponse(false);
             JsonObject output      = response->getRoot();
             uint8_t    return_code = CommandRet::NOT_FOUND;
             uint8_t    device_type = EMSdevice::DeviceType::CUSTOM;
@@ -324,7 +323,7 @@ void WebDataService::write_device_value(AsyncWebServerRequest * request, JsonVar
 
 // takes a temperaturesensor name and optional offset from the WebUI and update the customization settings
 // via the temperaturesensor service
-void WebDataService::write_temperature_sensor(AsyncWebServerRequest * request, JsonVariant & json) {
+void WebDataService::write_temperature_sensor(AsyncWebServerRequest * request, JsonVariant json) {
     bool ok = false;
     if (json.is<JsonObject>()) {
         JsonObject sensor = json;
@@ -347,7 +346,7 @@ void WebDataService::write_temperature_sensor(AsyncWebServerRequest * request, J
 }
 
 // update the analog record, or create a new one
-void WebDataService::write_analog_sensor(AsyncWebServerRequest * request, JsonVariant & json) {
+void WebDataService::write_analog_sensor(AsyncWebServerRequest * request, JsonVariant json) {
     bool ok = false;
     if (json.is<JsonObject>()) {
         JsonObject analog = json;
diff --git a/src/web/WebDataService.h b/src/web/WebDataService.h
index d85d20988..ada443d1f 100644
--- a/src/web/WebDataService.h
+++ b/src/web/WebDataService.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,9 +47,9 @@ class WebDataService {
     void device_data(AsyncWebServerRequest * request);
 
     // POST
-    void write_device_value(AsyncWebServerRequest * request, JsonVariant & json);
-    void write_temperature_sensor(AsyncWebServerRequest * request, JsonVariant & json);
-    void write_analog_sensor(AsyncWebServerRequest * request, JsonVariant & json);
+    void write_device_value(AsyncWebServerRequest * request, JsonVariant json);
+    void write_temperature_sensor(AsyncWebServerRequest * request, JsonVariant json);
+    void write_analog_sensor(AsyncWebServerRequest * request, JsonVariant json);
     void scan_devices(AsyncWebServerRequest * request); // command
 
     AsyncCallbackJsonWebHandler _write_value_handler, _write_temperature_handler, _write_analog_handler;
diff --git a/src/web/WebLogService.cpp b/src/web/WebLogService.cpp
index d3fe63729..703b2d9a3 100644
--- a/src/web/WebLogService.cpp
+++ b/src/web/WebLogService.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ namespace emsesp {
 
 WebLogService::WebLogService(AsyncWebServer * server, SecurityManager * securityManager)
     : events_(EVENT_SOURCE_LOG_PATH)
-    , setValues_(LOG_SETTINGS_PATH, std::bind(&WebLogService::setValues, this, _1, _2), 256) {
+    , setValues_(LOG_SETTINGS_PATH, std::bind(&WebLogService::setValues, this, _1, _2)) {
     events_.setFilter(securityManager->filterRequest(AuthenticationPredicates::IS_ADMIN));
 
     server->on(LOG_SETTINGS_PATH, HTTP_GET, std::bind(&WebLogService::getValues, this, _1)); // get settings
@@ -183,10 +183,8 @@ char * WebLogService::messagetime(char * out, const uint64_t t, const size_t buf
 
 // send to web eventsource
 void WebLogService::transmit(const QueuedLogMessage & message) {
-    DynamicJsonDocument jsonDocument(EMSESP_JSON_SIZE_LARGE);
-    if (jsonDocument.capacity() == 0) {
-        return;
-    }
+    JsonDocument jsonDocument;
+
     JsonObject logEvent = jsonDocument.to<JsonObject>();
     char       time_string[25];
 
@@ -213,7 +211,7 @@ void WebLogService::fetchLog(AsyncWebServerRequest * request) {
 }
 
 // sets the values like level after a POST
-void WebLogService::setValues(AsyncWebServerRequest * request, JsonVariant & json) {
+void WebLogService::setValues(AsyncWebServerRequest * request, JsonVariant json) {
     if (!json.is<JsonObject>()) {
         return;
     }
@@ -234,7 +232,7 @@ void WebLogService::setValues(AsyncWebServerRequest * request, JsonVariant & jso
 
 // return the current value settings after a GET
 void WebLogService::getValues(AsyncWebServerRequest * request) {
-    auto *     response  = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_SMALL);
+    auto *     response  = new AsyncJsonResponse(false);
     JsonObject root      = response->getRoot();
     root["level"]        = log_level();
     root["max_messages"] = maximum_log_messages();
diff --git a/src/web/WebLogService.h b/src/web/WebLogService.h
index 0f06bfff2..083b10fdc 100644
--- a/src/web/WebLogService.h
+++ b/src/web/WebLogService.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,7 +64,7 @@ class WebLogService : public uuid::log::Handler {
 
     char * messagetime(char * out, const uint64_t t, const size_t bufsize);
 
-    void setValues(AsyncWebServerRequest * request, JsonVariant & json);
+    void setValues(AsyncWebServerRequest * request, JsonVariant json);
 
     AsyncCallbackJsonWebHandler setValues_; // for POSTs
 
diff --git a/src/web/WebSchedulerService.cpp b/src/web/WebSchedulerService.cpp
index bb2b91c52..b7fd19d74 100644
--- a/src/web/WebSchedulerService.cpp
+++ b/src/web/WebSchedulerService.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -36,11 +36,11 @@ void WebSchedulerService::begin() {
 
 // this creates the scheduler file, saving it to the FS
 // and also calls when the Scheduler web page is refreshed
-void WebScheduler::read(WebScheduler & webScheduler, JsonObject & root) {
-    JsonArray schedule = root.createNestedArray("schedule");
+void WebScheduler::read(WebScheduler & webScheduler, JsonObject root) {
+    JsonArray schedule = root["schedule"].to<JsonArray>();
     uint8_t   counter  = 0;
     for (const ScheduleItem & scheduleItem : webScheduler.scheduleItems) {
-        JsonObject si = schedule.createNestedObject();
+        JsonObject si = schedule.add<JsonObject>();
         si["id"]      = counter++; // id is only used to render the table and must be unique
         si["active"]  = scheduleItem.active;
         si["flags"]   = scheduleItem.flags;
@@ -53,16 +53,16 @@ void WebScheduler::read(WebScheduler & webScheduler, JsonObject & root) {
 
 // call on initialization and also when the Schedule web page is saved
 // this loads the data into the internal class
-StateUpdateResult WebScheduler::update(JsonObject & root, WebScheduler & webScheduler) {
+StateUpdateResult WebScheduler::update(JsonObject root, WebScheduler & webScheduler) {
 #ifdef EMSESP_STANDALONE
     // invoke some fake data for testing
     const char * json =
         "{\"schedule\": [{\"id\":1,\"active\":true,\"flags\":31,\"time\": \"07:30\",\"cmd\": \"hc1mode\",\"value\": \"day\",\"name\": \"turn on "
         "central heating\"}]}";
-    StaticJsonDocument<500> doc;
+    JsonDocument doc;
     deserializeJson(doc, json);
     root = doc.as<JsonObject>();
-    Serial.println(COLOR_BRIGHT_MAGENTA);
+    Serial.print(COLOR_BRIGHT_MAGENTA);
     Serial.print(" Using fake scheduler file: ");
     serializeJson(root, Serial);
     Serial.println(COLOR_RESET);
@@ -113,6 +113,7 @@ bool WebSchedulerService::command_setvalue(const char * value, const std::string
     if (!Helpers::value2bool(value, v)) {
         return false;
     }
+
     EMSESP::webSchedulerService.read([&](WebScheduler & webScheduler) { scheduleItems = &webScheduler.scheduleItems; });
     for (ScheduleItem & scheduleItem : *scheduleItems) {
         if (scheduleItem.name == name) {
@@ -131,7 +132,7 @@ bool WebSchedulerService::command_setvalue(const char * value, const std::string
 }
 
 // process json output for info/commands and value_info
-bool WebSchedulerService::get_value_info(JsonObject & output, const char * cmd) {
+bool WebSchedulerService::get_value_info(JsonObject output, const char * cmd) {
     EMSESP::webSchedulerService.read([&](WebScheduler & webScheduler) { scheduleItems = &webScheduler.scheduleItems; });
     if (Helpers::toLower(cmd) == F_(commands)) {
         output[F_(info)]     = Helpers::translated_word(FL_(info_cmd));
@@ -143,9 +144,11 @@ bool WebSchedulerService::get_value_info(JsonObject & output, const char * cmd)
         }
         return true;
     }
+
     if (scheduleItems->size() == 0) {
         return true;
     }
+
     if (strlen(cmd) == 0 || Helpers::toLower(cmd) == F_(values) || Helpers::toLower(cmd) == F_(info)) {
         // list all names
         for (const ScheduleItem & scheduleItem : *scheduleItems) {
@@ -162,6 +165,7 @@ bool WebSchedulerService::get_value_info(JsonObject & output, const char * cmd)
         }
         return (output.size() > 0);
     }
+
     char command_s[30];
     strlcpy(command_s, cmd, sizeof(command_s));
     char * attribute_s = nullptr;
@@ -172,7 +176,7 @@ bool WebSchedulerService::get_value_info(JsonObject & output, const char * cmd)
         *breakp     = '\0';
         attribute_s = breakp + 1;
     }
-    JsonVariant data;
+
     for (const ScheduleItem & scheduleItem : *scheduleItems) {
         if (Helpers::toLower(scheduleItem.name) == Helpers::toLower(command_s)) {
             output["name"] = scheduleItem.name;
@@ -192,14 +196,17 @@ bool WebSchedulerService::get_value_info(JsonObject & output, const char * cmd)
             output["visible"]   = true;
         }
     }
+
     if (attribute_s && output.containsKey(attribute_s)) {
-        data = output[attribute_s];
+        String data = output[attribute_s].as<String>();
         output.clear();
         output["api_data"] = data;
     }
+
     if (output.size()) {
         return true;
     }
+
     output["message"] = "unknown command";
     return false;
 }
@@ -209,12 +216,14 @@ void WebSchedulerService::publish_single(const char * name, const bool state) {
     if (!Mqtt::publish_single() || name == nullptr || name[0] == '\0') {
         return;
     }
+
     char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
     if (Mqtt::publish_single2cmd()) {
         snprintf(topic, sizeof(topic), "%s/%s", F_(scheduler), name);
     } else {
         snprintf(topic, sizeof(topic), "%s%s/%s", F_(scheduler), "_data", name);
     }
+
     char payload[12];
     Mqtt::queue_publish(topic, Helpers::render_boolean(payload, state));
 }
@@ -224,21 +233,24 @@ void WebSchedulerService::publish(const bool force) {
     if (force) {
         ha_registered_ = false;
     }
+
     if (!Mqtt::enabled()) {
         return;
     }
+
     EMSESP::webSchedulerService.read([&](WebScheduler & webScheduler) { scheduleItems = &webScheduler.scheduleItems; });
     if (scheduleItems->size() == 0) {
         return;
     }
+
     if (Mqtt::publish_single() && force) {
         for (const ScheduleItem & scheduleItem : *scheduleItems) {
             publish_single(scheduleItem.name.c_str(), scheduleItem.active);
         }
     }
 
-    DynamicJsonDocument doc(EMSESP_JSON_SIZE_XLARGE);
-    bool                ha_created = ha_registered_;
+    JsonDocument doc;
+    bool         ha_created = ha_registered_;
     for (const ScheduleItem & scheduleItem : *scheduleItems) {
         if (!scheduleItem.name.empty() && !doc.containsKey(scheduleItem.name)) {
             if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
@@ -252,8 +264,8 @@ void WebSchedulerService::publish(const bool force) {
 
             // create HA config
             if (Mqtt::ha_enabled() && !ha_registered_) {
-                StaticJsonDocument<EMSESP_JSON_SIZE_MEDIUM> config;
-                char                                        stat_t[50];
+                JsonDocument config;
+                char         stat_t[50];
                 snprintf(stat_t, sizeof(stat_t), "%s/scheduler_data", Mqtt::base().c_str());
                 config["stat_t"] = stat_t;
 
@@ -272,9 +284,11 @@ void WebSchedulerService::publish(const bool force) {
 
                 char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
                 char command_topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
+
                 snprintf(topic, sizeof(topic), "switch/%s/scheduler_%s/config", Mqtt::basename().c_str(), scheduleItem.name.c_str());
                 snprintf(command_topic, sizeof(command_topic), "%s/scheduler/%s", Mqtt::base().c_str(), scheduleItem.name.c_str());
                 config["cmd_t"] = command_topic;
+
                 if (EMSESP::system_.bool_format() == BOOL_FORMAT_TRUEFALSE) {
                     config["pl_on"]  = true;
                     config["pl_off"] = false;
@@ -287,13 +301,8 @@ void WebSchedulerService::publish(const bool force) {
                     config["pl_off"] = Helpers::render_boolean(result, false);
                 }
 
-                JsonObject dev = config.createNestedObject("dev");
-                dev["name"]    = Mqtt::basename() + " Scheduler";
-                JsonArray ids  = dev.createNestedArray("ids");
-                ids.add(Mqtt::basename() + "-scheduler");
+                Mqtt::add_ha_sections_to_doc("scheduler", stat_t, config, !ha_created, val_cond);
 
-                // add "availability" section
-                Mqtt::add_avty_to_doc(stat_t, config.as<JsonObject>(), val_cond);
                 ha_created |= Mqtt::queue_ha(topic, config.as<JsonObject>());
             }
         }
@@ -309,6 +318,7 @@ bool WebSchedulerService::has_commands() {
     if (scheduleItems->size() == 0) {
         return false;
     }
+
     for (const ScheduleItem & scheduleItem : *scheduleItems) {
         if (!scheduleItem.name.empty()) {
             return true;
@@ -319,14 +329,14 @@ bool WebSchedulerService::has_commands() {
 
 // execute scheduled command
 bool WebSchedulerService::command(const char * cmd, const char * data) {
-    StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc_input;
-    JsonObject                                 input = doc_input.to<JsonObject>();
+    JsonDocument doc_input;
+    JsonObject   input = doc_input.to<JsonObject>();
     if (strlen(data)) { // empty data queries a value
         input["data"] = data;
     }
 
-    StaticJsonDocument<EMSESP_JSON_SIZE_SMALL> doc_output; // only for commands without output
-    JsonObject                                 output = doc_output.to<JsonObject>();
+    JsonDocument doc_output; // only for commands without output
+    JsonObject   output = doc_output.to<JsonObject>();
 
     // prefix "api/" to command string
     char command_str[100];
@@ -352,6 +362,7 @@ bool WebSchedulerService::command(const char * cmd, const char * data) {
     } else {
         snprintf(error, sizeof(error), "Scheduled command %s failed with error code (%s)", cmd, Command::return_code_string(return_code).c_str());
     }
+
     emsesp::EMSESP::logger().err(error);
     return false;
 }
diff --git a/src/web/WebSchedulerService.h b/src/web/WebSchedulerService.h
index ef012fc5a..d5496a9e1 100644
--- a/src/web/WebSchedulerService.h
+++ b/src/web/WebSchedulerService.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,8 +43,8 @@ class WebScheduler {
   public:
     std::list<ScheduleItem> scheduleItems;
 
-    static void              read(WebScheduler & webScheduler, JsonObject & root);
-    static StateUpdateResult update(JsonObject & root, WebScheduler & webScheduler);
+    static void              read(WebScheduler & webScheduler, JsonObject root);
+    static StateUpdateResult update(JsonObject root, WebScheduler & webScheduler);
 };
 
 class WebSchedulerService : public StatefulService<WebScheduler> {
@@ -57,7 +57,7 @@ class WebSchedulerService : public StatefulService<WebScheduler> {
     void publish(const bool force = false);
     bool has_commands();
     bool command_setvalue(const char * value, const std::string name);
-    bool get_value_info(JsonObject & output, const char * cmd);
+    bool get_value_info(JsonObject output, const char * cmd);
     void ha_reset() {
         ha_registered_ = false;
     }
diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp
index 513e322f1..436f5d23e 100644
--- a/src/web/WebSettingsService.cpp
+++ b/src/web/WebSettingsService.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ WebSettingsService::WebSettingsService(AsyncWebServer * server, FS * fs, Securit
     addUpdateHandler([&](const String & originId) { onUpdate(); }, false);
 }
 
-void WebSettings::read(WebSettings & settings, JsonObject & root) {
+void WebSettings::read(WebSettings & settings, JsonObject root) {
     root["version"]               = settings.version;
     root["locale"]                = settings.locale;
     root["tx_mode"]               = settings.tx_mode;
@@ -80,7 +80,7 @@ void WebSettings::read(WebSettings & settings, JsonObject & root) {
 }
 
 // call on initialization and also when settings are updated via web or console
-StateUpdateResult WebSettings::update(JsonObject & root, WebSettings & settings) {
+StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) {
     // load the version of the settings
     // will be picked up in System::check_upgrade()
     settings.version = root["version"] | EMSESP_DEFAULT_VERSION;
@@ -364,7 +364,7 @@ void WebSettingsService::board_profile(AsyncWebServerRequest * request) {
     if (request->hasParam("boardProfile")) {
         std::string board_profile = request->getParam("boardProfile")->value().c_str();
 
-        auto *     response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_MEDIUM);
+        auto *     response = new AsyncJsonResponse(false);
         JsonObject root     = response->getRoot();
 
         std::vector<int8_t> data; // led, dallas, rx, tx, button, phy_type, eth_power, eth_phy_addr, eth_clock_mode
diff --git a/src/web/WebSettingsService.h b/src/web/WebSettingsService.h
index c887cdf09..d820f1ce2 100644
--- a/src/web/WebSettingsService.h
+++ b/src/web/WebSettingsService.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -71,8 +71,8 @@ class WebSettings {
     uint8_t eth_phy_addr;
     uint8_t eth_clock_mode;
 
-    static void              read(WebSettings & settings, JsonObject & root);
-    static StateUpdateResult update(JsonObject & root, WebSettings & settings);
+    static void              read(WebSettings & settings, JsonObject root);
+    static StateUpdateResult update(JsonObject root, WebSettings & settings);
 
     enum ChangeFlags : uint8_t {
 
diff --git a/src/web/WebStatusService.cpp b/src/web/WebStatusService.cpp
index 59272fc50..08cd42b60 100644
--- a/src/web/WebStatusService.cpp
+++ b/src/web/WebStatusService.cpp
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -115,7 +115,7 @@ void WebStatusService::WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
 }
 
 void WebStatusService::webStatusService(AsyncWebServerRequest * request) {
-    auto *     response = new AsyncJsonResponse(false, EMSESP_JSON_SIZE_LARGE);
+    auto *     response = new AsyncJsonResponse(false);
     JsonObject root     = response->getRoot();
 
     root["status"]      = EMSESP::bus_status(); // 0, 1 or 2
@@ -125,29 +125,29 @@ void WebStatusService::webStatusService(AsyncWebServerRequest * request) {
     root["num_sensors"] = EMSESP::temperaturesensor_.no_sensors();
     root["num_analogs"] = EMSESP::analogsensor_.no_sensors();
 
-    JsonArray  statsJson = root.createNestedArray("stats");
+    JsonArray  statsJson = root["stats"].to<JsonArray>();
     JsonObject statJson;
 
-    statJson       = statsJson.createNestedObject();
+    statJson       = statsJson.add<JsonObject>();
     statJson["id"] = 0;
     statJson["s"]  = EMSESP::rxservice_.telegram_count();
     statJson["f"]  = EMSESP::rxservice_.telegram_error_count();
     statJson["q"]  = EMSESP::rxservice_.quality();
 
-    statJson       = statsJson.createNestedObject();
+    statJson       = statsJson.add<JsonObject>();
     statJson["id"] = 1;
     statJson["s"]  = EMSESP::txservice_.telegram_read_count();
     statJson["f"]  = EMSESP::txservice_.telegram_read_fail_count();
     statJson["q"]  = EMSESP::txservice_.read_quality();
 
-    statJson       = statsJson.createNestedObject();
+    statJson       = statsJson.add<JsonObject>();
     statJson["id"] = 2;
     statJson["s"]  = EMSESP::txservice_.telegram_write_count();
     statJson["f"]  = EMSESP::txservice_.telegram_write_fail_count();
     statJson["q"]  = EMSESP::txservice_.write_quality();
 
     if (EMSESP::sensor_enabled()) {
-        statJson       = statsJson.createNestedObject();
+        statJson       = statsJson.add<JsonObject>();
         statJson["id"] = 3;
         statJson["s"]  = EMSESP::temperaturesensor_.reads() - EMSESP::temperaturesensor_.fails();
         statJson["f"]  = EMSESP::temperaturesensor_.fails();
@@ -155,21 +155,21 @@ void WebStatusService::webStatusService(AsyncWebServerRequest * request) {
             EMSESP::temperaturesensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::temperaturesensor_.fails()) / EMSESP::temperaturesensor_.reads());
     }
     if (EMSESP::analog_enabled()) {
-        statJson       = statsJson.createNestedObject();
+        statJson       = statsJson.add<JsonObject>();
         statJson["id"] = 4;
         statJson["s"]  = EMSESP::analogsensor_.reads() - EMSESP::analogsensor_.fails();
         statJson["f"]  = EMSESP::analogsensor_.fails();
         statJson["q"]  = EMSESP::analogsensor_.reads() == 0 ? 100 : 100 - (uint8_t)((100 * EMSESP::analogsensor_.fails()) / EMSESP::analogsensor_.reads());
     }
     if (Mqtt::enabled()) {
-        statJson       = statsJson.createNestedObject();
+        statJson       = statsJson.add<JsonObject>();
         statJson["id"] = 5;
         statJson["s"]  = Mqtt::publish_count() - Mqtt::publish_fails();
         statJson["f"]  = Mqtt::publish_fails();
         statJson["q"]  = Mqtt::publish_count() == 0 ? 100 : 100 - (uint8_t)((100 * Mqtt::publish_fails()) / Mqtt::publish_count());
     }
 
-    statJson       = statsJson.createNestedObject();
+    statJson       = statsJson.add<JsonObject>();
     statJson["id"] = 6;
     statJson["s"]  = WebAPIService::api_count(); // + WebAPIService::api_fails();
     statJson["f"]  = WebAPIService::api_fails();
@@ -179,7 +179,7 @@ void WebStatusService::webStatusService(AsyncWebServerRequest * request) {
 
 #ifndef EMSESP_STANDALONE
     if (EMSESP::system_.syslog_enabled()) {
-        statJson       = statsJson.createNestedObject();
+        statJson       = statsJson.add<JsonObject>();
         statJson["id"] = 7;
         statJson["s"]  = EMSESP::system_.syslog_count();
         statJson["f"]  = EMSESP::system_.syslog_fails();
diff --git a/src/web/WebStatusService.h b/src/web/WebStatusService.h
index c0111a86f..48551aac0 100644
--- a/src/web/WebStatusService.h
+++ b/src/web/WebStatusService.h
@@ -1,6 +1,6 @@
 /*
  * EMS-ESP - https://github.com/emsesp/EMS-ESP
- * Copyright 2020-2023  Paul Derbyshire
+ * Copyright 2020-2024  Paul Derbyshire
  * 
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by