diff --git a/packages/bindx-client/src/schema/SchemaRegistry.ts b/packages/bindx-client/src/schema/SchemaRegistry.ts
index a3d68a4..17c19e7 100644
--- a/packages/bindx-client/src/schema/SchemaRegistry.ts
+++ b/packages/bindx-client/src/schema/SchemaRegistry.ts
@@ -38,7 +38,7 @@ export class SchemaRegistry<TModels extends Record<string, object> = Record<stri
 
 			for (const [fieldName, field] of entity.fields) {
 				if (field.__typename === '_Column') {
-					fields[fieldName] = { type: 'scalar' }
+					fields[fieldName] = { type: 'scalar', columnType: field.type }
 				} else if (field.__typename === '_Relation') {
 					const inverse = field.side === 'owning' ? field.inversedBy ?? undefined : field.ownedBy
 					const isMany = field.type === 'OneHasMany' || field.type === 'ManyHasMany'
@@ -281,6 +281,8 @@ interface RawContemberFieldDef {
 	readonly entity?: string
 	readonly target?: string
 	readonly inverse?: string
+	readonly columnType?: string
+	readonly enumName?: string
 }
 
 /**
@@ -295,7 +297,7 @@ function normalizeEntityDef(entityDef: EntitySchemaDef): EntitySchemaDef {
 		const raw = fieldDef as RawContemberFieldDef
 
 		if (raw.type === 'column') {
-			fields[fieldName] = { type: 'scalar' }
+			fields[fieldName] = { type: 'scalar', columnType: raw.columnType }
 			needsNormalization = true
 		} else if (raw.type === 'one') {
 			fields[fieldName] = {
diff --git a/packages/bindx-form/src/hooks/useFormInputHandler.ts b/packages/bindx-form/src/hooks/useFormInputHandler.ts
index 8c90548..4970047 100644
--- a/packages/bindx-form/src/hooks/useFormInputHandler.ts
+++ b/packages/bindx-form/src/hooks/useFormInputHandler.ts
@@ -148,25 +148,9 @@ const defaultTypeHandlers: Partial<Record<ColumnType, HandlerFactory>> = {
 	Enum: createStringHandler,
 }
 
-/**
- * Maps Contember DB column types (lowercase) to ColumnType (PascalCase).
- * Handles both formats so the handler works with schema-provided types.
- */
-const columnTypeAliases: Record<string, ColumnType> = {
-	text: 'String',
-	integer: 'Integer',
-	double: 'Double',
-	date: 'Date',
-	timestamptz: 'DateTime',
-	time: 'Time',
-	bool: 'Bool',
-	uuid: 'Uuid',
-	jsonb: 'Json',
-}
-
 function resolveColumnType(columnType: string | undefined): ColumnType | undefined {
 	if (!columnType) return undefined
-	return (columnTypeAliases[columnType] ?? columnType) as ColumnType
+	return columnType as ColumnType
 }
 
 /**
diff --git a/packages/bindx-generator/src/NameSchemaGenerator.ts b/packages/bindx-generator/src/NameSchemaGenerator.ts
index fe03fff..cd511ea 100644
--- a/packages/bindx-generator/src/NameSchemaGenerator.ts
+++ b/packages/bindx-generator/src/NameSchemaGenerator.ts
@@ -54,8 +54,8 @@ export class NameSchemaGenerator {
 						visitColumn: ctx => {
 							scalars.push(ctx.column.name)
 							fields[ctx.column.name] = ctx.column.type === Model.ColumnType.Enum
-								? { type: 'column', columnType: ctx.column.columnType, enumName: ctx.column.columnType }
-								: { type: 'column', columnType: ctx.column.columnType }
+								? { type: 'column', columnType: ctx.column.type, enumName: ctx.column.columnType }
+								: { type: 'column', columnType: ctx.column.type }
 						},
 					})
 
diff --git a/packages/bindx-generator/tests/entityGenerator.test.ts b/packages/bindx-generator/tests/entityGenerator.test.ts
index 3008218..49b4475 100644
--- a/packages/bindx-generator/tests/entityGenerator.test.ts
+++ b/packages/bindx-generator/tests/entityGenerator.test.ts
@@ -17,7 +17,7 @@ describe('NameSchemaGenerator', () => {
 
 		expect(schema.entities['Post']?.fields['author']).toEqual({ type: 'one', entity: 'Author', nullable: false })
 		expect(schema.entities['Post']?.fields['tags']).toEqual({ type: 'many', entity: 'Tag', relationKind: 'manyHasMany', nullable: undefined })
-		expect(schema.entities['Post']?.fields['title']).toEqual({ type: 'column', columnType: 'text' })
+		expect(schema.entities['Post']?.fields['title']).toEqual({ type: 'column', columnType: 'String' })
 		expect(schema.enums['PostStatus']).toEqual(['draft', 'published', 'archived'])
 	})
 })