diff --git a/lottery_predictor/collect.py b/lottery_predictor/collect.py
index 9f6a2e8..da3c200 100644
--- a/lottery_predictor/collect.py
+++ b/lottery_predictor/collect.py
@@ -25,7 +25,7 @@ def get_record_count(table_name: str) -> int | None:
         dal.connect()
         session = dal.Session()
         target_table = Base.metadata.tables.get(game_dict['db_table_name'])
-        return session.execute(text(f"select count(draw_date) from {target_table.name}")).first()[0]
+        return session.query(func.count(target_table.columns.draw_date)).first()[0]
     else:
         raise ValueError('An invalid table name was specified.')
 
@@ -37,7 +37,7 @@ def get_recent_draw_date(table_name: str) -> datetime | None:
         dal.connect()
         session = dal.Session()
         target_table = Base.metadata.tables.get(game_dict['db_table_name'])
-        return session.execute(text(f"select max(draw_date) from {target_table.name}")).first()[0]
+        return session.query(func.max(target_table.columns.draw_date)).first()[0]
     else:
         raise ValueError('An invalid table name was specified.')