DAO: Updated/Implemented some calsses