DAOs modified to Generic
DAOs modified to Generic