Updated cve classes