diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e376d97..548e37b 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
     <DebugType>embedded</DebugType>
     <AssemblyVersion>2.1.0.0</AssemblyVersion>
     <FileVersion>2.1.0.0</FileVersion>
diff --git a/src/MyWebLog.Data/MyWebLog.Data.fsproj b/src/MyWebLog.Data/MyWebLog.Data.fsproj
index 6a6ae75..707825c 100644
--- a/src/MyWebLog.Data/MyWebLog.Data.fsproj
+++ b/src/MyWebLog.Data/MyWebLog.Data.fsproj
@@ -5,21 +5,17 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BitBadger.Npgsql.FSharp.Documents" Version="1.0.0-beta3" />
-		<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.8" />
-		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
+		<PackageReference Include="BitBadger.Npgsql.FSharp.Documents" Version="2.0.0" />
+		<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
 		<PackageReference Include="Microsoft.FSharpLu.Json" Version="0.11.7" />
 		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.0.1" />
-		<PackageReference Include="Npgsql.NodaTime" Version="7.0.4" />
+		<PackageReference Include="NodaTime.Serialization.JsonNet" Version="3.1.0" />
+		<PackageReference Include="Npgsql.NodaTime" Version="8.0.1" />
 		<PackageReference Include="RethinkDb.Driver" Version="2.3.150" />
 		<PackageReference Include="RethinkDb.Driver.FSharp" Version="0.9.0-beta-07" />
 	</ItemGroup>
-	
-	<ItemGroup>
-		<PackageReference Update="FSharp.Core" Version="7.0.300" />
-	</ItemGroup>
 
 	<ItemGroup>
 		<Compile Include="Converters.fs" />
diff --git a/src/MyWebLog.Data/Postgres/PostgresCategoryData.fs b/src/MyWebLog.Data/Postgres/PostgresCategoryData.fs
index 244faed..5b703fa 100644
--- a/src/MyWebLog.Data/Postgres/PostgresCategoryData.fs
+++ b/src/MyWebLog.Data/Postgres/PostgresCategoryData.fs
@@ -122,7 +122,7 @@ type PostgresCategoryData (log : ILogger) =
     /// Save a category
     let save (cat : Category) = backgroundTask {
         log.LogTrace "Category.save"
-        do! save Table.Category (CategoryId.toString cat.Id) cat
+        do! save Table.Category cat
     }
     
     /// Restore categories from a backup
diff --git a/src/MyWebLog.Data/Postgres/PostgresPageData.fs b/src/MyWebLog.Data/Postgres/PostgresPageData.fs
index faa4c79..6feb078 100644
--- a/src/MyWebLog.Data/Postgres/PostgresPageData.fs
+++ b/src/MyWebLog.Data/Postgres/PostgresPageData.fs
@@ -145,7 +145,7 @@ type PostgresPageData (log : ILogger) =
     let save (page : Page) = backgroundTask {
         log.LogTrace "Page.save"
         let! oldPage = findFullById page.Id page.WebLogId
-        do! save Table.Page (PageId.toString page.Id) { page with Revisions = [] }
+        do! save Table.Page { page with Revisions = [] }
         do! updatePageRevisions page.Id (match oldPage with Some p -> p.Revisions | None -> []) page.Revisions
         ()
     }
diff --git a/src/MyWebLog.Data/Postgres/PostgresPostData.fs b/src/MyWebLog.Data/Postgres/PostgresPostData.fs
index d3791de..ac676e7 100644
--- a/src/MyWebLog.Data/Postgres/PostgresPostData.fs
+++ b/src/MyWebLog.Data/Postgres/PostgresPostData.fs
@@ -175,7 +175,7 @@ type PostgresPostData (log : ILogger) =
     let save (post : Post) = backgroundTask {
         log.LogTrace "Post.save"
         let! oldPost = findFullById post.Id post.WebLogId
-        do! save Table.Post (PostId.toString post.Id) { post with Revisions = [] }
+        do! save Table.Post { post with Revisions = [] }
         do! updatePostRevisions post.Id (match oldPost with Some p -> p.Revisions | None -> []) post.Revisions
     }
     
diff --git a/src/MyWebLog.Data/Postgres/PostgresTagMapData.fs b/src/MyWebLog.Data/Postgres/PostgresTagMapData.fs
index 6c0aa52..210dc14 100644
--- a/src/MyWebLog.Data/Postgres/PostgresTagMapData.fs
+++ b/src/MyWebLog.Data/Postgres/PostgresTagMapData.fs
@@ -46,7 +46,7 @@ type PostgresTagMapData (log : ILogger) =
     
     /// Save a tag mapping
     let save (tagMap : TagMap) =
-        save Table.TagMap (TagMapId.toString tagMap.Id) tagMap
+        save Table.TagMap tagMap
     
     /// Restore tag mappings from a backup
     let restore (tagMaps : TagMap list) = backgroundTask {
diff --git a/src/MyWebLog.Data/Postgres/PostgresThemeData.fs b/src/MyWebLog.Data/Postgres/PostgresThemeData.fs
index 00af329..cf3a569 100644
--- a/src/MyWebLog.Data/Postgres/PostgresThemeData.fs
+++ b/src/MyWebLog.Data/Postgres/PostgresThemeData.fs
@@ -47,7 +47,7 @@ type PostgresThemeData (log : ILogger) =
     /// Save a theme
     let save (theme : Theme) =
         log.LogTrace "Theme.save"
-        save Table.Theme (ThemeId.toString theme.Id) theme
+        save Table.Theme theme
     
     interface IThemeData with
         member _.All () = all ()
diff --git a/src/MyWebLog.Data/Postgres/PostgresWebLogData.fs b/src/MyWebLog.Data/Postgres/PostgresWebLogData.fs
index ef6020c..f583cc2 100644
--- a/src/MyWebLog.Data/Postgres/PostgresWebLogData.fs
+++ b/src/MyWebLog.Data/Postgres/PostgresWebLogData.fs
@@ -11,7 +11,7 @@ type PostgresWebLogData (log : ILogger) =
     /// Add a web log
     let add (webLog : WebLog) =
         log.LogTrace "WebLog.add"
-        insert Table.WebLog (WebLogId.toString webLog.Id) webLog
+        insert Table.WebLog webLog
     
     /// Retrieve all web logs
     let all () =
diff --git a/src/MyWebLog.Data/Postgres/PostgresWebLogUserData.fs b/src/MyWebLog.Data/Postgres/PostgresWebLogUserData.fs
index 80eeee3..32b912e 100644
--- a/src/MyWebLog.Data/Postgres/PostgresWebLogUserData.fs
+++ b/src/MyWebLog.Data/Postgres/PostgresWebLogUserData.fs
@@ -85,7 +85,7 @@ type PostgresWebLogUserData (log : ILogger) =
     /// Save a user
     let save (user : WebLogUser) =
         log.LogTrace "WebLogUser.save"
-        save Table.WebLogUser (WebLogUserId.toString user.Id) user
+        save Table.WebLogUser user
     
     interface IWebLogUserData with
         member _.Add user = save user
diff --git a/src/MyWebLog/MyWebLog.fsproj b/src/MyWebLog/MyWebLog.fsproj
index 7b21a1c..a270487 100644
--- a/src/MyWebLog/MyWebLog.fsproj
+++ b/src/MyWebLog/MyWebLog.fsproj
@@ -31,7 +31,6 @@
     <PackageReference Include="NeoSmart.Caching.Sqlite" Version="6.1.0" />
     <PackageReference Include="RethinkDB.DistributedCache" Version="1.0.0-rc1" />
     <PackageReference Include="System.ServiceModel.Syndication" Version="7.0.0" />
-    <PackageReference Update="FSharp.Core" Version="7.0.300" />
   </ItemGroup>
 
   <ItemGroup>