Added more threats and keythreats