updated to use Generic DAO