Added new daos and tests