diff --git a/LayoutFunctions/ClassroomLayout/hypar.json b/LayoutFunctions/ClassroomLayout/hypar.json
index 6cf1cc20..0e46d3f9 100644
--- a/LayoutFunctions/ClassroomLayout/hypar.json
+++ b/LayoutFunctions/ClassroomLayout/hypar.json
@@ -77,5 +77,6 @@
   ],
   "repository_url": "https://github.com/hypar-io/function",
   "source_file_key": null,
-  "preview_image": null
+  "preview_image": null,
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/ClassroomLayout/src/Function.g.cs b/LayoutFunctions/ClassroomLayout/src/Function.g.cs
index 4de301e1..e0a603c9 100644
--- a/LayoutFunctions/ClassroomLayout/src/Function.g.cs
+++ b/LayoutFunctions/ClassroomLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<ClassroomLayoutOutputs> Handler(ClassroomLayoutInputs args)
             {
                 this.store = new UrlModelStore<ClassroomLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<ClassroomLayoutInputs,ClassroomLayoutOutputs> (store, ClassroomLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/DataHall/hypar.json b/LayoutFunctions/DataHall/hypar.json
index 8eb2fad7..2402f3dd 100644
--- a/LayoutFunctions/DataHall/hypar.json
+++ b/LayoutFunctions/DataHall/hypar.json
@@ -111,5 +111,6 @@
   "repository_url": "https://github.com/hypar-io/function",
   "source_file_key": null,
   "preview_image": null,
-  "thumbnail_id": null
+  "thumbnail_id": null,
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/DataHall/src/Function.g.cs b/LayoutFunctions/DataHall/src/Function.g.cs
index 00a1e843..6429866f 100644
--- a/LayoutFunctions/DataHall/src/Function.g.cs
+++ b/LayoutFunctions/DataHall/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<DataHallLayoutOutputs> Handler(DataHallLayoutInputs args)
             {
                 this.store = new UrlModelStore<DataHallLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<DataHallLayoutInputs,DataHallLayoutOutputs> (store, DataHallLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/InteriorPartitions/src/Function.g.cs b/LayoutFunctions/InteriorPartitions/src/Function.g.cs
index dcf09b0a..7ad940a2 100644
--- a/LayoutFunctions/InteriorPartitions/src/Function.g.cs
+++ b/LayoutFunctions/InteriorPartitions/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<InteriorPartitionsOutputs> Handler(InteriorPartitionsInputs ar
             {
                 this.store = new UrlModelStore<InteriorPartitionsInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<InteriorPartitionsInputs,InteriorPartitionsOutputs> (store, InteriorPartitions.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/LoungeLayout/hypar.json b/LayoutFunctions/LoungeLayout/hypar.json
index 62c652db..b5173b67 100644
--- a/LayoutFunctions/LoungeLayout/hypar.json
+++ b/LayoutFunctions/LoungeLayout/hypar.json
@@ -58,5 +58,6 @@
   ],
   "repository_url": "https://github.com/hypar-io/function",
   "source_file_key": null,
-  "preview_image": null
+  "preview_image": null,
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/LoungeLayout/src/Function.g.cs b/LayoutFunctions/LoungeLayout/src/Function.g.cs
index ea606ca2..42c66392 100644
--- a/LayoutFunctions/LoungeLayout/src/Function.g.cs
+++ b/LayoutFunctions/LoungeLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<LoungeLayoutOutputs> Handler(LoungeLayoutInputs args)
             {
                 this.store = new UrlModelStore<LoungeLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<LoungeLayoutInputs,LoungeLayoutOutputs> (store, LoungeLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/MeetingRoomLayout/hypar.json b/LayoutFunctions/MeetingRoomLayout/hypar.json
index f5452b24..afbce3d4 100644
--- a/LayoutFunctions/MeetingRoomLayout/hypar.json
+++ b/LayoutFunctions/MeetingRoomLayout/hypar.json
@@ -75,5 +75,6 @@
     "https://schemas.hypar.io/CirculationSegment.json",
     "https://schemas.hypar.io/LevelVolume.json",
     "https://schemas.hypar.io/RoomTally.json"
-  ]
+  ],
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/MeetingRoomLayout/src/Function.g.cs b/LayoutFunctions/MeetingRoomLayout/src/Function.g.cs
index a43ec1bd..30741e60 100644
--- a/LayoutFunctions/MeetingRoomLayout/src/Function.g.cs
+++ b/LayoutFunctions/MeetingRoomLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<MeetingRoomLayoutOutputs> Handler(MeetingRoomLayoutInputs args
             {
                 this.store = new UrlModelStore<MeetingRoomLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<MeetingRoomLayoutInputs,MeetingRoomLayoutOutputs> (store, MeetingRoomLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/OpenCollabLayout/hypar.json b/LayoutFunctions/OpenCollabLayout/hypar.json
index c5698502..17dc7305 100644
--- a/LayoutFunctions/OpenCollabLayout/hypar.json
+++ b/LayoutFunctions/OpenCollabLayout/hypar.json
@@ -73,5 +73,6 @@
   "repository_url": "https://github.com/hypar-io/function",
   "source_file_key": null,
   "preview_image": null,
-  "thumbnail_id": null
+  "thumbnail_id": null,
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/OpenCollabLayout/src/Function.g.cs b/LayoutFunctions/OpenCollabLayout/src/Function.g.cs
index 014e81ce..f67178b5 100644
--- a/LayoutFunctions/OpenCollabLayout/src/Function.g.cs
+++ b/LayoutFunctions/OpenCollabLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<OpenCollaborationLayoutOutputs> Handler(OpenCollaborationLayou
             {
                 this.store = new UrlModelStore<OpenCollaborationLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<OpenCollaborationLayoutInputs,OpenCollaborationLayoutOutputs> (store, OpenCollaborationLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/OpenOfficeLayout/hypar.json b/LayoutFunctions/OpenOfficeLayout/hypar.json
index 58f2039d..7523701e 100644
--- a/LayoutFunctions/OpenOfficeLayout/hypar.json
+++ b/LayoutFunctions/OpenOfficeLayout/hypar.json
@@ -293,5 +293,6 @@
   "default_camera": {
     "named_position": "top",
     "projection": "orthographic"
-  }
+  },
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/OpenOfficeLayout/src/Function.g.cs b/LayoutFunctions/OpenOfficeLayout/src/Function.g.cs
index 509825f9..50b46bcb 100644
--- a/LayoutFunctions/OpenOfficeLayout/src/Function.g.cs
+++ b/LayoutFunctions/OpenOfficeLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<OpenOfficeLayoutOutputs> Handler(OpenOfficeLayoutInputs args)
             {
                 this.store = new UrlModelStore<OpenOfficeLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<OpenOfficeLayoutInputs,OpenOfficeLayoutOutputs> (store, OpenOfficeLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/PantryLayout/hypar.json b/LayoutFunctions/PantryLayout/hypar.json
index 91b6be5f..de37a01c 100644
--- a/LayoutFunctions/PantryLayout/hypar.json
+++ b/LayoutFunctions/PantryLayout/hypar.json
@@ -66,5 +66,6 @@
   ],
   "repository_url": "https://github.com/hypar-io/function",
   "source_file_key": null,
-  "preview_image": null
+  "preview_image": null,
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/PantryLayout/src/Function.g.cs b/LayoutFunctions/PantryLayout/src/Function.g.cs
index 5fcf0c90..09b9c00e 100644
--- a/LayoutFunctions/PantryLayout/src/Function.g.cs
+++ b/LayoutFunctions/PantryLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<PantryLayoutOutputs> Handler(PantryLayoutInputs args)
             {
                 this.store = new UrlModelStore<PantryLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<PantryLayoutInputs,PantryLayoutOutputs> (store, PantryLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/PhoneBoothLayout/hypar.json b/LayoutFunctions/PhoneBoothLayout/hypar.json
index 90676cae..fa2522d9 100644
--- a/LayoutFunctions/PhoneBoothLayout/hypar.json
+++ b/LayoutFunctions/PhoneBoothLayout/hypar.json
@@ -84,5 +84,6 @@
   ],
   "repository_url": "https://github.com/hypar-io/function",
   "source_file_key": null,
-  "preview_image": null
+  "preview_image": null,
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/PhoneBoothLayout/src/Function.g.cs b/LayoutFunctions/PhoneBoothLayout/src/Function.g.cs
index c390ec83..d457f388 100644
--- a/LayoutFunctions/PhoneBoothLayout/src/Function.g.cs
+++ b/LayoutFunctions/PhoneBoothLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<PhoneBoothLayoutOutputs> Handler(PhoneBoothLayoutInputs args)
             {
                 this.store = new UrlModelStore<PhoneBoothLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<PhoneBoothLayoutInputs,PhoneBoothLayoutOutputs> (store, PhoneBoothLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/PrivateOfficeLayout/dependencies/PrivateOfficeLayout.Dependencies.csproj b/LayoutFunctions/PrivateOfficeLayout/dependencies/PrivateOfficeLayout.Dependencies.csproj
index f34a70a8..d39f6d2b 100644
--- a/LayoutFunctions/PrivateOfficeLayout/dependencies/PrivateOfficeLayout.Dependencies.csproj
+++ b/LayoutFunctions/PrivateOfficeLayout/dependencies/PrivateOfficeLayout.Dependencies.csproj
@@ -4,8 +4,6 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\LayoutFunctionCommon\LayoutFunctionCommon.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <PackageReference Include="Hypar.Elements" Version="2.2.0-alpha.21" />
     <PackageReference Include="Hypar.Functions" Version="1.11.0-alpha.13" />
   </ItemGroup>
diff --git a/LayoutFunctions/PrivateOfficeLayout/server/PrivateOfficeLayout.Server.csproj b/LayoutFunctions/PrivateOfficeLayout/server/PrivateOfficeLayout.Server.csproj
index fb64020c..c6751e91 100644
--- a/LayoutFunctions/PrivateOfficeLayout/server/PrivateOfficeLayout.Server.csproj
+++ b/LayoutFunctions/PrivateOfficeLayout/server/PrivateOfficeLayout.Server.csproj
@@ -2,10 +2,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\src\PrivateOfficeLayout.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Hypar.Server" Version="1.11.0-alpha.13" />
+    <ProjectReference Include="..\..\..\..\Hypar\Hypar.Server\Hypar.Server.csproj" />
   </ItemGroup>
 
   <PropertyGroup>
diff --git a/LayoutFunctions/PrivateOfficeLayout/src/Function.g.cs b/LayoutFunctions/PrivateOfficeLayout/src/Function.g.cs
index b9227542..4ae8d74c 100644
--- a/LayoutFunctions/PrivateOfficeLayout/src/Function.g.cs
+++ b/LayoutFunctions/PrivateOfficeLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<PrivateOfficeLayoutOutputs> Handler(PrivateOfficeLayoutInputs
             {
                 this.store = new UrlModelStore<PrivateOfficeLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<PrivateOfficeLayoutInputs,PrivateOfficeLayoutOutputs> (store, PrivateOfficeLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/LayoutFunctions/ReceptionLayout/hypar.json b/LayoutFunctions/ReceptionLayout/hypar.json
index 33adecd3..64a865db 100644
--- a/LayoutFunctions/ReceptionLayout/hypar.json
+++ b/LayoutFunctions/ReceptionLayout/hypar.json
@@ -63,5 +63,6 @@
   ],
   "repository_url": "https://github.com/hypar-io/function",
   "source_file_key": null,
-  "preview_image": null
+  "preview_image": null,
+  "stream_model": true
 }
\ No newline at end of file
diff --git a/LayoutFunctions/ReceptionLayout/src/Function.g.cs b/LayoutFunctions/ReceptionLayout/src/Function.g.cs
index cd3a99bc..f10ffcac 100644
--- a/LayoutFunctions/ReceptionLayout/src/Function.g.cs
+++ b/LayoutFunctions/ReceptionLayout/src/Function.g.cs
@@ -63,7 +63,7 @@ public async Task<ReceptionLayoutOutputs> Handler(ReceptionLayoutInputs args)
             {
                 this.store = new UrlModelStore<ReceptionLayoutInputs>();
             }
-            
+            args.StreamModel = true;
 
             var l = new InvocationWrapper<ReceptionLayoutInputs,ReceptionLayoutOutputs> (store, ReceptionLayout.Execute);
             var output = await l.InvokeAsync(args);
diff --git a/ZonePlanningFunctions/Function-SpacePlanning b/ZonePlanningFunctions/Function-SpacePlanning
index 479f2b40..18f125cd 160000
--- a/ZonePlanningFunctions/Function-SpacePlanning
+++ b/ZonePlanningFunctions/Function-SpacePlanning
@@ -1 +1 @@
-Subproject commit 479f2b406abbade29d8b7893b6cfcc8426b15eac
+Subproject commit 18f125cd769683f656889ffcc465d940221bc20c