Updated, to mirror the Entity -> DAO change