(COMMIT-45) DAO functionality update