Added modified DAO

- Still need to modify implementation