Updated generic DAO