Added and merged DAO files

Eventhough there occurs a error at runtime,...