Reapplied lost changes about Parse DAO