Fix Timestamp Issue and Improve DAO