#9 change some methods in DAO
Revert "#9 change some methods in DAO"

This reverts commit 6f79aa446265c0585b506573fb67a99b1bc8738c.