diff --git a/src/data/clubs.json.ts b/src/data/clubs.json.ts
index 02bd81f..5b2deb3 100644
--- a/src/data/clubs.json.ts
+++ b/src/data/clubs.json.ts
@@ -10,7 +10,7 @@ const Clubs = Schema.Array(
   }),
 )
 
-const Output = Schema.Record(Schema.String, Schema.String)
+const Output = Schema.Record({ key: Schema.String, value: Schema.String })
 
 const program = Effect.gen(function* () {
   const terminal = yield* Terminal.Terminal
diff --git a/src/data/openalex-domains.json.ts b/src/data/openalex-domains.json.ts
index 46b89fe..de42a78 100644
--- a/src/data/openalex-domains.json.ts
+++ b/src/data/openalex-domains.json.ts
@@ -14,7 +14,7 @@ const Domains = Schema.Struct({
   ),
 })
 
-const DomainNames = Schema.Record(DomainIdSchema, Schema.String)
+const DomainNames = Schema.Record({ key: DomainIdSchema, value: Schema.String })
 
 const program = Effect.gen(function* () {
   const terminal = yield* Terminal.Terminal
diff --git a/src/data/openalex-fields.json.ts b/src/data/openalex-fields.json.ts
index 0eb3743..6a65575 100644
--- a/src/data/openalex-fields.json.ts
+++ b/src/data/openalex-fields.json.ts
@@ -17,7 +17,10 @@ const Fields = Schema.Struct({
   ),
 })
 
-const FieldNames = Schema.Record(FieldIdSchema, Schema.Struct({ name: Schema.String, domain: DomainIdSchema }))
+const FieldNames = Schema.Record({
+  key: FieldIdSchema,
+  value: Schema.Struct({ name: Schema.String, domain: DomainIdSchema }),
+})
 
 const program = Effect.gen(function* () {
   const terminal = yield* Terminal.Terminal
diff --git a/src/data/openalex-subfields.json.ts b/src/data/openalex-subfields.json.ts
index fe2839c..436c36a 100644
--- a/src/data/openalex-subfields.json.ts
+++ b/src/data/openalex-subfields.json.ts
@@ -17,7 +17,10 @@ const Subfields = Schema.Struct({
   ),
 })
 
-const SubfieldNames = Schema.Record(SubfieldIdSchema, Schema.Struct({ name: Schema.String, field: FieldIdSchema }))
+const SubfieldNames = Schema.Record({
+  key: SubfieldIdSchema,
+  value: Schema.Struct({ name: Schema.String, field: FieldIdSchema }),
+})
 
 const program = Effect.gen(function* () {
   const terminal = yield* Terminal.Terminal
diff --git a/src/data/preprint-servers.json.ts b/src/data/preprint-servers.json.ts
index 6dfab17..ace8da4 100644
--- a/src/data/preprint-servers.json.ts
+++ b/src/data/preprint-servers.json.ts
@@ -4,7 +4,7 @@ import { Schema } from '@effect/schema'
 import { Effect } from 'effect'
 import * as PreprintServer from '../lib/PreprintServer.js'
 
-const Output = Schema.Record(Schema.String, Schema.String)
+const Output = Schema.Record({ key: Schema.String, value: Schema.String })
 
 const program = Effect.gen(function* () {
   const terminal = yield* Terminal.Terminal