fixed address
Refactored Dao's to the same design.