Add Generics for Dao to limit warnings