diff --git a/CHANGELOG.md b/CHANGELOG.md
index e94acc46..abb969d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# 3.1.1
+Upgrading all packages, leaving CJS stack trace in place so we can monitor updates of packages that haven't been upgraded to ESM only yet, type fixes
+## @hakit/components
+- No code changes aside from base package upgrades
+
+## @hakit/core
+- BUGFIX - BIG Thanks to @koriwi - the useArea hook will now match related devices/entities where entities are indirectly related to an area (device is in the area but a sub entity is not)
+- BUGFIX - HassConnect was previously returning React.ReactNode as the return type, but i've removed this and left it to type inference as there's a bug with typescript < 5.1 where it doesn't properly work with React.
+- BUGFIX - Test framework working again for @core only, still need to work on client side.
+
 # 1.1.1
 ## create-hakit
 - Adjustments to deploy script
diff --git a/packages/core/src/types/index.ts b/packages/core/src/types/index.ts
index 8ff95898..6322fc9f 100644
--- a/packages/core/src/types/index.ts
+++ b/packages/core/src/types/index.ts
@@ -7,10 +7,12 @@ import type { TimelineState, EntityHistoryState } from "../hooks/useHistory/hist
 export type { HistoryStreamMessage, TimelineState, HistoryResult, EntityHistoryState } from "../hooks/useHistory/history";
 
 export interface CustomSupportedServices<T extends ServiceFunctionTypes = "target"> {
-  unknown: T;
+  // populated by the sync script and will be overwritten by the user
+  UNDETERMINED: T;
 }
+
 // dodgey hack to determine if the custom supported services are empty or not, if they're empty we use the default services
-export type SupportedServices<T extends ServiceFunctionTypes = "target"> = [keyof CustomSupportedServices<T>] extends ["unknown"]
+export type SupportedServices<T extends ServiceFunctionTypes = "target"> = [keyof CustomSupportedServices<T>] extends ["UNDETERMINED"]
   ? DefaultServices<T>
   : CustomSupportedServices<T>;