Re-added modified DAO; implementation OK.