diff --git a/models/user.py b/models/user.py
index faf81eb..2f3e1be 100644
--- a/models/user.py
+++ b/models/user.py
@@ -1,11 +1,16 @@
 from sqlalchemy import Column, String, Boolean
+from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.sql import func
 from core.database import Base
+import uuid
 
 class User(Base):
     __tablename__ = "users"
 
-    id = Column(String, primary_key=True)
-    username = Column(String, unique=True, index=True)
-    email = Column(String, unique=True, index=True)
-    hashed_password = Column(String)
-    disabled = Column(Boolean, default=False)
+    id = Column(UUID(as_uuid=True), primary_key=True, default=uuid.uuid4)
+    username = Column(String, unique=True, nullable=False, index=True)
+    email = Column(String, unique=True, nullable=False)
+    password = Column(String, nullable=False)
+    is_active = Column(Boolean, default=True)
+    created_at = Column(UUID(as_uuid=True), server_default=func.now())
+    updated_at = Column(UUID(as_uuid=True), onupdate=func.now())
\ No newline at end of file