Added generic DAO class