diff --git a/cef_3M/sql.py b/cef_3M/sql.py
index d6b1bea..0c932ad 100644
--- a/cef_3M/sql.py
+++ b/cef_3M/sql.py
@@ -23,9 +23,3 @@ ergoEngine = create_engine(
 )
 
 SessionMaker = sessionmaker(autocommit=False, autoflush=False, bind=engine, )
-
-
-def ergoQueryFetchOne(q: str, **kwargs):
-    with ergoEngine.connect() as connection:
-        connection.execute(text("use ergo"))
-        return connection.execute(text(q), kwargs).fetchone()
diff --git a/cef_3M/util.py b/cef_3M/util.py
index 1e5a874..d8c351a 100644
--- a/cef_3M/util.py
+++ b/cef_3M/util.py
@@ -12,10 +12,12 @@ from minio import Minio
 from redis.asyncio import Redis
 from pywebpush import WebPusher
 
-from .sql import SessionMaker, AlertEndpoints, ergoQueryFetchOne
+from .sql import SessionMaker, AlertEndpoints
 
 from fastapi import UploadFile
 
+from .sql_generated import History
+
 safeName = re.compile(r"[^\w\d\.-]")
 
 
@@ -53,11 +55,12 @@ class ErgoClient:
                     "p256dh": target.p256dh
                 }
             })
-            messageQuery = ergoQueryFetchOne("SELECT `data` FROM `history` WHERE `msgid` = :id", id=int(msgid)).data
-            message = json.loads(messageQuery.decode("utf8"))
+            messageQuery: History = session.query(History).filter(History.msgid == int(msgid)).first()
+
+            message = json.loads(messageQuery.data.decode("utf8"))
             encoded = json.dumps({
                 "channel": channel,
-                "from": message["AccountName"],
+                "from": message["Account"],
                 "content": message["Message"]["Message"]
             }).encode("utf8")
 
@@ -79,8 +82,9 @@ class ErgoClient:
                 message = await pubsub.get_message(ignore_subscribe_messages=True, timeout=None)
                 try:
                     await self.handleUserMessage(message)
-                except Exception as e:
-                    print("Error in handling user message", e)
+                except:
+                    print("Error in handling user message")
+                    traceback.print_exc()