diff --git a/services/api-gateway/app/models/whatsapp.py b/services/api-gateway/app/models/whatsapp.py
index c4f7bcd..8c9eab0 100644
--- a/services/api-gateway/app/models/whatsapp.py
+++ b/services/api-gateway/app/models/whatsapp.py
@@ -68,7 +68,7 @@ class Contact(Base):
     name = Column(String(100), nullable=True)
     email = Column(String(255), nullable=True)
     company = Column(String(100), nullable=True)
-    metadata = Column(JSONB, default=dict)
+    extra_data = Column(JSONB, default=dict)
     tags = Column(ARRAY(String), default=list)
     odoo_partner_id = Column(Integer, nullable=True)
     created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
@@ -110,7 +110,7 @@ class Message(Base):
     type = Column(SQLEnum(MessageType), default=MessageType.TEXT, nullable=False)
     content = Column(Text, nullable=True)
     media_url = Column(String(500), nullable=True)
-    metadata = Column(JSONB, default=dict)
+    extra_data = Column(JSONB, default=dict)
     sent_by = Column(UUID(as_uuid=True), ForeignKey("users.id"), nullable=True)
     is_internal_note = Column(Boolean, default=False, nullable=False)
     status = Column(SQLEnum(MessageStatus), default=MessageStatus.PENDING, nullable=False)
diff --git a/services/api-gateway/requirements.txt b/services/api-gateway/requirements.txt
index 386d1da..8416e70 100644
--- a/services/api-gateway/requirements.txt
+++ b/services/api-gateway/requirements.txt
@@ -6,7 +6,7 @@ psycopg2-binary==2.9.10
 python-jose[cryptography]==3.3.0
 passlib[bcrypt]==1.7.4
 python-multipart==0.0.20
-pydantic==2.10.4
+pydantic[email]==2.10.4
 pydantic-settings==2.7.1
 redis==5.2.1
 httpx==0.28.1