diff --git a/packages/fabric/sqlite-store/events/event-store.ts b/packages/fabric/sqlite-store/events/event-store.ts
index a86b12d..8bf63e2 100644
--- a/packages/fabric/sqlite-store/events/event-store.ts
+++ b/packages/fabric/sqlite-store/events/event-store.ts
@@ -1,5 +1,6 @@
 import {
   AsyncResult,
+  JSONUtils,
   MaybePromise,
   PosixDate,
   Run,
@@ -11,7 +12,6 @@ import {
   EventFromKey,
   EventStore,
   EventSubscriber,
-  JSONUtils,
   StoredEvent,
   StoreQueryError,
 } from "@fabric/domain";
diff --git a/packages/fabric/sqlite-store/sqlite/model-to-sql.test.ts b/packages/fabric/sqlite-store/sqlite/model-to-sql.test.ts
index a26853c..e00e5db 100644
--- a/packages/fabric/sqlite-store/sqlite/model-to-sql.test.ts
+++ b/packages/fabric/sqlite-store/sqlite/model-to-sql.test.ts
@@ -8,7 +8,7 @@ describe("ModelToSQL", () => {
     name: Field.string(),
     age: Field.integer(),
     // isTrue: Field.boolean(),
-    date: Field.timestamp(),
+    date: Field.posixDate(),
     reference: Field.reference({ targetModel: "somethingElse" }),
   });
 
diff --git a/packages/fabric/sqlite-store/sqlite/model-to-sql.ts b/packages/fabric/sqlite-store/sqlite/model-to-sql.ts
index 819ffd9..9269b3a 100644
--- a/packages/fabric/sqlite-store/sqlite/model-to-sql.ts
+++ b/packages/fabric/sqlite-store/sqlite/model-to-sql.ts
@@ -40,7 +40,7 @@ const FieldSQLDefinitionMap: FieldSQLDefinitionMap = {
   DecimalField: (n, f): string => {
     return [n, "REAL", modifiersFromOpts(f)].join(" ");
   },
-  TimestampField: (n, f): string => {
+  PosixDateField: (n, f): string => {
     return [n, "NUMERIC", modifiersFromOpts(f)].join(" ");
   },
   EmbeddedField: (n, f): string => {
@@ -49,6 +49,9 @@ const FieldSQLDefinitionMap: FieldSQLDefinitionMap = {
   BooleanField: (n, f): string => {
     return [n, "BOOLEAN", modifiersFromOpts(f)].join(" ");
   },
+  EmailField: (n, f): string => {
+    return [n, "TEXT", modifiersFromOpts(f)].join(" ");
+  },
 };
 function fieldDefinitionToSQL(name: string, field: FieldDefinition) {
   return FieldSQLDefinitionMap[field[VariantTag]](name, field as any);
diff --git a/packages/fabric/sqlite-store/sqlite/sql-to-value.ts b/packages/fabric/sqlite-store/sqlite/sql-to-value.ts
index 0be1bee..fb3f556 100644
--- a/packages/fabric/sqlite-store/sqlite/sql-to-value.ts
+++ b/packages/fabric/sqlite-store/sqlite/sql-to-value.ts
@@ -1,5 +1,5 @@
 // deno-lint-ignore-file no-explicit-any
-import { PosixDate, VariantTag } from "@fabric/core";
+import { JSONUtils, PosixDate, VariantTag } from "@fabric/core";
 import { FieldDefinition, FieldToType, Model } from "@fabric/domain";
 
 export function transformRow(model: Model) {
@@ -39,7 +39,8 @@ const FieldSQLInsertMap: FieldSQLInsertMap = {
   ReferenceField: (_, v) => v,
   FloatField: (_, v) => v,
   DecimalField: (_, v) => v,
-  TimestampField: (_, v) => new PosixDate(v),
-  EmbeddedField: (_, v: string) => JSON.parse(v),
+  PosixDateField: (_, v) => new PosixDate(v),
+  EmbeddedField: (_, v: string) => JSONUtils.parse(v),
   BooleanField: (_, v) => v,
+  EmailField: (_, v) => v,
 };
diff --git a/packages/fabric/sqlite-store/sqlite/value-to-sql.ts b/packages/fabric/sqlite-store/sqlite/value-to-sql.ts
index 7991922..34b4d74 100644
--- a/packages/fabric/sqlite-store/sqlite/value-to-sql.ts
+++ b/packages/fabric/sqlite-store/sqlite/value-to-sql.ts
@@ -1,6 +1,7 @@
 // deno-lint-ignore-file no-explicit-any
-import { VariantTag } from "@fabric/core";
+import { JSONUtils, VariantTag } from "@fabric/core";
 import { FieldDefinition, FieldToType } from "@fabric/domain";
+import { isNullish } from "@fabric/validations";
 
 type FieldSQLInsertMap = {
   [K in FieldDefinition[VariantTag]]: (
@@ -20,13 +21,14 @@ const FieldSQLInsertMap: FieldSQLInsertMap = {
   ReferenceField: (_, v) => v,
   FloatField: (_, v) => v,
   DecimalField: (_, v) => v,
-  TimestampField: (_, v) => v.timestamp,
-  EmbeddedField: (_, v: string) => JSON.stringify(v),
+  PosixDateField: (_, v) => v.timestamp,
+  EmbeddedField: (_, v: string) => JSONUtils.stringify(v),
   BooleanField: (_, v) => v,
+  EmailField: (_, v) => v,
 };
 
 export function fieldValueToSQL(field: FieldDefinition, value: any) {
-  if (value === null) {
+  if (isNullish(value)) {
     return null;
   }
   const r = FieldSQLInsertMap[field[VariantTag]] as any;
diff --git a/packages/fabric/sqlite-store/state/state-store.test.ts b/packages/fabric/sqlite-store/state/state-store.test.ts
index b969d69..9de0bb3 100644
--- a/packages/fabric/sqlite-store/state/state-store.test.ts
+++ b/packages/fabric/sqlite-store/state/state-store.test.ts
@@ -1,14 +1,7 @@
-import { Run, UUID } from "@fabric/core";
+import { Run } from "@fabric/core";
 import { Field, isLike, Model } from "@fabric/domain";
 import { UUIDGeneratorMock } from "@fabric/domain/mocks";
-import {
-  afterEach,
-  beforeEach,
-  describe,
-  expect,
-  expectTypeOf,
-  test,
-} from "@fabric/testing";
+import { afterEach, beforeEach, describe, expect, test } from "@fabric/testing";
 import { SQLiteStateStore } from "./state-store.ts";
 
 describe("State Store", () => {
@@ -16,6 +9,7 @@ describe("State Store", () => {
     Model.entityFrom("demo", {
       value: Field.float(),
       owner: Field.reference({ targetModel: "users" }),
+      optional: Field.string({ isOptional: true }),
     }),
     Model.entityFrom("users", {
       name: Field.string(),
@@ -52,12 +46,12 @@ describe("State Store", () => {
 
     const result = await store.from("users").select().unwrapOrThrow();
 
-    expectTypeOf(result).toEqualTypeOf<
-      {
-        id: UUID;
-        name: string;
-      }[]
-    >();
+    // expectTypeOf(result).toEqualTypeOf<
+    //   {
+    //     id: UUID;
+    //     name: string;
+    //   }[]
+    // >();
 
     expect(result).toEqual([
       {
@@ -95,12 +89,12 @@ describe("State Store", () => {
       })
       .select().unwrapOrThrow();
 
-    expectTypeOf(result).toEqualTypeOf<
-      {
-        id: UUID;
-        name: string;
-      }[]
-    >();
+    // expectTypeOf(result).toEqualTypeOf<
+    //   {
+    //     id: UUID;
+    //     name: string;
+    //   }[]
+    // >();
 
     expect(result).toEqual([
       {