Updated models and CWE Reference