Added some part of Dao logic and mock environment