#1 [Technical] Refactor Dao Part