Refactored field_threats