diff --git a/rfcs/text/0008-threat-intel.md b/rfcs/text/0008-threat-intel.md
index c7ca2996d7..b2c779227e 100644
--- a/rfcs/text/0008-threat-intel.md
+++ b/rfcs/text/0008-threat-intel.md
@@ -1,10 +1,10 @@
 # 0008: Cyber Threat Intelligence Fields
 <!-- Leave this ID at 0000. The ECS team will assign a unique, contiguous RFC number upon merging the initial stage of this RFC. -->
 
-- Stage: **1 (proposal)** <!-- Update to reflect target stage. See https://elastic.github.io/ecs/stages.html -->
-- Date: **2020-11-09** <!-- The ECS team sets this date at merge time. This is the date of the latest stage advancement. -->
+- Stage: **1 (draft)** <!-- Update to reflect target stage. See https://elastic.github.io/ecs/stages.html -->
+- Date: **2021-02-18** <!-- The ECS team sets this date at merge time. This is the date of the latest stage advancement. -->
 
-Elastic Security Solution will be adding the capability to ingest, process and utilize threat intelligence information for increasing detection coverage and helping analysts making quicker investigation decisions. Threat intelligence can be collected from a number of sources with a variety of structured and semi-structured data representations. This makes threat intelligence an ideal candidate for ECS mappings. Threat intelligence data will require ECS mappings to normalize it and make it usable in our security solution. This RFC is focused on identifying new field sets and values that need to be created for threat intelligence data. Existing ECS field reuse will be prioritized where possible. If new fields are required we will utilize [STIX Cyber Observable data model](https://docs.oasis-open.org/cti/stix/v2.1/cs01/stix-v2.1-cs01.html#_mlbmudhl16lr) as guidance.
+Elastic Security Solution will be adding the capability to ingest, process and utilize threat intelligence information for increasing detection coverage and helping analysts make quicker investigation decisions. Threat intelligence can be collected from a number of sources with a variety of structured and semi-structured data representations. This makes threat intelligence an ideal candidate for ECS mappings. Threat intelligence data will require ECS mappings to normalize it and make it usable in our security solution. This RFC is focused on identifying new field sets and values that need to be created for threat intelligence data. Existing ECS field reuse will be prioritized where possible. If new fields are required we will utilize [STIX Cyber Observable data model](https://docs.oasis-open.org/cti/stix/v2.1/cs01/stix-v2.1-cs01.html#_mlbmudhl16lr) as guidance.
 
 <!--
 As you work on your RFC, use the "Stage N" comments to guide you in what you should focus on, for the stage you're targeting.
@@ -23,43 +23,55 @@ Stage 1: Describe at a high level how this change affects fields. Which fieldset
 
 ### Proposed New Fields for Threat fieldset
 
-  * threat.time_first_seen
-    _The date and time when intelligence souce first reported sighting this indicator._
-  * threat.time_last_seen
-    _The date and time when intelligence source last reported sighting this indicator._
-  * threat.sightings
-    _Number of times this indicator was observed conducting threat activity._
-  * threat.type
-    _Type of indicator as reprsented by Cyber Observable in STIX 2.0_
-  * threat.description
-    _Describes the type of action conducted by the threat._
-  * threat.tlp
-    _Traffic Light Protocol, which dictates sharing policies_
-  * threat.classification
-    _Describes type of threat delivery (Hacktool etc.) and family name.
-  * threat.scanner_stats
-    _Count of Anti virus/EDR that successfully detected malicious file or URL. Sources like VirusTotal, Reversing Labs often provide these statistics._
-
-### Proposed New Values
-
-  * event.kind:enrichment _Propose adding this value to capture outcome of this event. It could also appy to other types of contextual data such as directory services, IPAM data, asset lists._
-  * event.category:threat _Proposed threat.type field would be a subcategory for this value of event.category_
-  * event.type:indicator _Proposed value represents type of threat information. In future this could be extended to other STIX 2.0 Standard Data Objects like Actor, Infrastucture etc._
-
-### Existing ECS Fields For Nested Use in Threat.*
-
-  * file.*
-  * file.hash.*
-  * url.*
-  * user.*
-  * registry.*
-  * as.*
-  * host.*
-  * network.*
-  * x509.*
-  * pe.*
-  * source.*
-  * destination.*
+Field | Type | Example | Description
+--- | --- | --- | ---
+threat.indicator.first_seen | date | 2020-12-01 | The date and time when intelligence source first reported sighting this indicator
+threat.indicator.last_seen | date | 2020-12-02| The date and time when intelligence source last reported sighting this indicator.
+threat.indicator.sightings | long | 20 | Number of times this indicator was observed conducting threat activity
+threat.indicator.type | keyword | ipv4-addr, domain-name, email-addr | Type of indicator as represented by Cyber Observable in STIX 2.0
+threat.indicator.description | wildcard | 201.10.10.90 was seen delivering Angler EK | Describes the type of action conducted by the threat
+threat.indicator.dataset | keyword | theatintel | Identifies the name of specific dataset from the intelligence source.
+threat.indicator.module | keyword | threatintel.{abusemalware,abuseurl,misp,otx,limo} | Identifies the name of specific module where the data is coming from.
+threat.indicator.provider | keyword | Abuse.ch | Identifies the name of intelligence provider.
+threat.indicator.confidence | keyword | High, 10, Confirmed by other sources, Certain, Almost Certain / Nearly Certain | Identifies the confidence rating assigned by the provider using STIX confidence scales (N/H/M/L, 0-10, Admirality, WEP, or DNI).
+threat.indicator.ip | ip | 1.2.3.4 | Identifies a threat indicator as an IP address (irrespective of direction).
+threat.indicator.domain | keyword | evil.com | Identifies a threat indicator as a domain (irrespective of direction).
+threat.indicator.port | long | 443 | Identifies a threat indicator as a port number (irrespective of direction).
+threat.indicator.email.address | keyword | phish@evil.com | Identifies a threat indicator as an email address (irrespective of direction).
+threat.marking.tlp | keyword | RED | Data markings represent restrictions, permissions, and other guidance for how data can be used and shared. Examples could be TLP (White, Green, Amber, Red).
+threat.indicator.scanner_stats | long | 4 | Count of Anti virus/EDR that successfully detected malicious file or URL. Sources like VirusTotal, Reversing Labs often provide these statistics.
+threat.indicator.matched.atomic | keyword | 2f5207f2add28b46267dc99bc5382480 | Identifies the atomic indicator that matched a local environment endpoint or network event.
+threat.indicator.matched.field | keyword | threat.indicator.ip | Identifies the field of the atomic indicator that matched a local environment endpoint or network event.
+threat.indicator.matched.type | keyword | ipv4-addr, domain-name, email-addr, url | Identifies the type of the atomic indicator that matched a local environment endpoint or network event.
+
+### Proposed New Values for Event Fieldset
+
+Field | New Value | Description
+--- | --- | ---
+event.kind | enrichment | Propose adding this value to capture the type of information this event contains and how it should be used. Threat intelligence will be used to enrich source events and signals. Enrichment could also appy to other types of contextual data sources (not just threat intelligence) such as directory services, IPAM data, asset lists.
+event.category | threat | Propose adding this value to represent a new category of event data
+event.type | indicator | Propose adding this value to be used as a sub-bucket of `event.category` to represent type of threat information. In future this could be extended to other STIX 2.0 Standard Data Objects like Actor, Infrastucture etc.
+
+### Using existing Event Fieldset
+Field | Type | Example | Description
+--- | ---| --- | ---
+event.reference | keyword | https://feodotracker.abuse.ch/ | URL to the intelligence source
+event.severity | long | 7 | severity provided by threat intelligence source
+event.risk_score | float | 10 | risk score provided by threat intelligence source
+event.original | keyword | 2020-10-29 19:16:38,181.120.29.49,80,2020-11-02,Heodo | raw intelligence event
+
+### Using existing ECS Fields to store indicator information
+
+Fieldset | Description | Reference
+--- | --- | ---
+File | Use existing File fields to describe file entity details involved in threat activity. No changes to existing ECS fieldset | [File Fields](https://www.elastic.co/guide/en/ecs/current/ecs-file.html)
+Hash | Use existing Hash fields to describe file entity details involved in threat activity. Hash fields are expected to be nested at `file.hash` , `process.hash`. No changes to existing ECS fieldset | [Hash Fields](https://www.elastic.co/guide/en/ecs/current/ecs-hash.html)
+URL | Use existing URL fields to describe internet resources involved in threat activity. No changes to existing ECS fieldset | [URL](https://www.elastic.co/guide/en/ecs/current/ecs-url.html)
+Registry | Use existing Registry fields involved in threat activity. No changes to existing ECS fieldset | [Registry](https://www.elastic.co/guide/en/ecs/current/ecs-registry.html)
+Autonomous System (AS) | Use existing fields to capture routing prefixes for threat activity. AS fields are expected to be nested at `source.as` , `destination.as`, or `threat.indicator`. Changes will be needed to existing fieldset to add `threat.indicator`. | [AS](https://www.elastic.co/guide/en/ecs/current/ecs-as.html)
+Geographic | Use existing fields to capture geographic location for threat activity. Changes will be needed to the field reuse section to add `threat.indicator`. | [Geo](https://www.elastic.co/guide/en/ecs/current/ecs-geo.html)
+x509 | Use existing fields to describe certificates involved in threat activity. No changes to existing fieldset. | [x509](https://www.elastic.co/guide/en/ecs/current/ecs-x509.html)
+Portable Executable (PE) | Use existing fields to describe portable executables involved in threat activity. No changes to existing fieldset. | [PE](https://www.elastic.co/guide/en/ecs/current/ecs-pe.html)
 
 <!--
 Stage 2: Include new or updated yml field definitions for all of the essential fields in this draft. While not exhaustive, the fields documented here should be comprehensive enough to deeply evaluate the technical considerations of this change. The goal here is to validate the technical details for all essential fields and to provide a basis for adding experimental field definitions to the schema. Use GitHub code blocks with yml syntax formatting.
@@ -75,7 +87,170 @@ Stage 3: Add or update all remaining field definitions. The list should now be e
 Stage 1: Describe at a high-level how these field changes will be used in practice. Real world examples are encouraged. The goal here is to understand how people would leverage these fields to gain insights or solve problems. ~1-3 paragraphs.
 -->
 
-The additions to threat.* fields and nested use will be used to represent data collected threat intelligence sources. A new rule type Indicator match will be introduced in 7.10 and ECS threat fields will enable a new category of detection alerts that matches incoming log and event data against threat intelligence sources and generates an alert. Additionally in the future we will be able to enrich events and alerts with context from threat intelligence to assist analysts in their investigative workflows.
+The additions described above will be used to enable cyber threat intelligence capabilities in Elastic Security solution. A new rule type Indicator match will be introduced in 7.10 and the proposed ECS updates will enable a new category of detection alerts that match incoming log and event data against threat intelligence sources. Additionally in the future we will also develop enrichment flows that add context from threat intelligence to alerts and events to assist analysts in their investigative workflows.
+
+There are two primary uses for these fields.
+
+1. **Storing threat intelligence as an event document in threat index(s).**
+
+    Threat intelligence data will be collected from multiple sources stored in threat indices. The ECS fields proposed here will be used to structure the documents collected from various sources.
+
+**Example**
+```json5
+{
+    "@timestamp": "2019-08-10T11:09:23.000Z",
+    "event.kind": "enrichment",
+    "event.category": "threat",
+    "event.type": "indicator",
+    "event.provider": "Abuse.ch",
+    "event.reference": "https://feodotracker.abuse.ch",
+    "event.dataset": "threatintel.abusemalware",
+    "event.module": "threatintel",
+
+    // The top-level file object here allows expressing multiple indicators for a single file object
+    "file.hash.sha256": "0c415dd718e3b3728707d579cf8214f54c2942e964975a5f925e0b82fea644b4",
+    "file.hash.md5": "1eee2bf3f56d8abed72da2bc523e7431",
+    "file.size": 656896,
+    "file.name": "invoice.doc",
+
+    // The indicator prefix here gives context of the indicators
+    "indicator.marking.tlp": "WHITE",
+    "indicator.time_first_seen": "2020-10-01",
+    "indicator.time_last_seen": "2020-11-01",
+    "indicator.sightings": "4",
+    /* It's possible to have multiple related indicators in a given document,
+       e.g. sha256, sha1, ssdeep, etc. If that's the case this should be an array
+       of types (i.e. [sha1, sha256, ssdeep]) */
+    "indicator.type": ["sha256", "md5", "file_name", "file_size"],
+    "indicator.description": "file last associated with delivering Angler EK",
+
+    // Filebeats and other fields, not part of ECS proposal
+    "fileset.name": "abusemalware",
+    "input.type": "log",
+    "log.offset": 0,
+
+    // Any indicators should also be copied to relevant related.* field
+    "related": {
+        "hash": [
+            "1eee2bf3f56d8abed72da2bc523e7431",
+            "0c415dd718e3b3728707d579cf8214f54c2942e964975a5f925e0b82fea644b4"
+        ]
+    },
+    "tags": [
+        "threatintel",
+        "forwarded"
+    ],
+}
+```
+
+2. **Adding threat intelligence match/enrichment to another document which could be in a source event index or signals index.**
+
+    The Indicator Match Rule will be used to generate signals when a match occurs between a source event and threat intelligence document. The ECS fields proposed here will be used to add the enrichment and threat intel context in the signal document.
+
+**Example**
+```json5
+{
+    "process": {
+        "name": "svchost.exe",
+        "pid": 1644,
+        "entity_id": "MDgyOWFiYTYtMzRkYi1kZTM2LTFkNDItMzBlYWM3NDVlOTgwLTE2NDQtMTMyNDk3MTA2OTcuNDc1OTExNTAw",
+        "executable": "C:\\Windows\\System32\\svchost.exe"
+    },
+    "message": "Endpoint file event",
+    "@timestamp": "2020-11-17T19:07:46.0956672Z",
+    "file": {
+        "path": "C:\\Windows\\Prefetch\\SVCHOST.EXE-AE7DB802.pf",
+        "extension": "pf",
+        "name": "SVCHOST.EXE-AE7DB802.pf",
+        "hash": {
+            "sha256": "0c415dd718e3b3728707d579cf8214f54c2942e964975a5f925e0b82fea644b4"
+        }
+    },
+    "threat": {
+        "indicator": [
+            {
+                // Each enrichment is added as a nested object under `threat.indicator.*`
+                // Copy all the object indicators under `indicator.*`, providing full context
+                "file": {
+                    "hash": {
+                        "sha256": "0c415dd718e3b3728707d579cf8214f54c2942e964975a5f925e0b82fea644b4",
+                        "md5": "1eee2bf3f56d8abed72da2bc523e7431"
+                    },
+                    "size": 656896,
+                    "name": "invoice.doc"
+                },
+                /* `matched` will provide context about which of the indicators above matched on this
+                    particular enrichment. If multiple matches for this indicator object, this could
+                    be a list */
+                "matched": "sha256",
+                "marking": {
+                    "tlp": "WHITE"
+                },
+                "first_seen": "2020-10-01",
+                "last_seen": "2020-11-01",
+                "sightings": 4,
+                "type": ["sha256", "md5", "file_name", "file_size"],
+                "description": "file last associated with delivering Angler EK",
+
+                // Copy event.* data from source threatintel document
+                "provider": "Abuse.ch",
+                "dataset": "threatintel.abusemalware",
+                "module": "threatintel"
+            }
+        ]
+    },
+    // Tag the enriched document to indicate the threat enrichment matched
+    "tags": [
+        "threat-match"
+    ],
+    // This should already exist from the original ingest pipeline of the document
+    "related": {
+        "hash": [
+            "0c415dd718e3b3728707d579cf8214f54c2942e964975a5f925e0b82fea644b4"
+        ]
+    }
+}
+```
+
+### Proposed enrichment pipeline mechanics pseudocode
+
+1. Original document completes its standard pipeline for the given source (i.e. filebeat module pipeline)
+2. Original document is sent to "threat lookup" pipeline
+3. For each indicator type, we perform the following (a file sha256 for example):
+    - if exists "file.hash.sha256":
+        - enrich processor:
+            "policy_name": "file-sha256-policy",
+            "field" : "file.hash.sha256",
+            "target_field": "threat_match",
+            "max_matches": "1"
+        - policy file-sha256-policy:
+            "match": {
+                "indices": "threat-*",
+                "match_field": "file.hash.sha256",
+                "enrich_fields": ["event", "file", "indicator"]
+            }
+    - rename:
+        field: "threat_match.file"
+        target: "threat_match.indicator.file"
+    - rename:
+        field: "threat_match.event.provider"
+        target: "threat_match.indicator.provider"
+    - rename:
+        field: "threat_match.event.dataset"
+        target: "threat_match.indicator.dataset"
+    - rename:
+        field: "threat_match.event.module"
+        target: "threat_match.indicator.module"
+    - set:
+        field: "threat_match.indicator.matched"
+        value: "sha256"
+    - append:
+        field: "threat.indicator"
+        value: "{{ threat_match.indicator }}"
+    - remove:
+        field: "threat_match"
+
+**NOTE**: There may be some optimization on which enrichments we attempt based upon the event categorization fields. For instance, we know that data that presents the netflow model or "interface" doesn't contain a sha256 hash. Since those categorization fields are lists, if data presented as both netflow and file (for whatever reason), then we'd check both network-related lookups and file-related lookups
 
 ## Source data
 
@@ -83,21 +258,12 @@ The additions to threat.* fields and nested use will be used to represent data c
 Stage 1: Provide a high-level description of example sources of data. This does not yet need to be a concrete example of a source document, but instead can simply describe a potential source (e.g. nginx access log). This will ultimately be fleshed out to include literal source examples in a future stage. The goal here is to identify practical sources for these fields in the real world. ~1-3 sentences or unordered list.
 -->
 
-There are many sources of threat intelligence including open source, closed source and membership based ISAC's. Depending on the source the level of details can vary from atomic indicators of compromise (IoC) to higher order context around threat tactics, infrastructure and motivations. Generally freely available (open source) intelligence sources will provide details more focused on IoC's and commercial intelligence services will provide higher order details.
+There are many sources of threat intelligence including open source, closed source, and membership-based ISAC's. Depending on the source the level of details can vary from atomic indicators of compromise (IoC) to higher-order context around threat tactics, infrastructure, and motivations. Generally freely available (open source) intelligence sources will provide details more focused on indicators and commercial intelligence services will provide higher-order details.
 
 These sources typically provide intelligence that can be downloaded through REST API or in some cases downloadable CSV's or text files. These intelligence sources will update their data repositories at varying intervals.
 
-Some examples of open source intelligence are:
-  * [Abuse.ch Feodo Tracker](https://feodotracker.abuse.ch/downloads/ipblocklist.csv) - see below for sample data
-  * [Phish Tank](https://www.phishtank.com/)
-
-Some examples of commercial intelligence include:
-  * [Anomali ThreatStream](https://www.anomali.com/products/threatstream)
-  * [Virus Total](https://www.virustotal.com/gui/intelligence-overview)
-  * [Domain Tools](https://www.domaintools.com/products/api-integration/)
-
 #### Abuse.ch Feodo Tracker
-
+This dataset from Abuse.ch provides a list of botnet C&C servers associated with the Feodo malware family (Dridex, Emotet).
 ```
 # Firstseen,DstIP,DstPort,LastOnline,Malware
 2020-10-29 19:16:38,181.120.29.49,80,2020-11-02,Heodo
@@ -114,6 +280,91 @@ Some examples of commercial intelligence include:
 Stage 2: Included a real world example source document. Ideally this example comes from the source(s) identified in stage 1. If not, it should replace them. The goal here is to validate the utility of these field changes in the context of a real world example. Format with the source name as a ### header and the example document in a GitHub code block with json formatting.
 -->
 
+#### Botvrij.eu
+
+Freely available source of indicators which includes Network indicators, File Details, Email and Registry Key
+
+```
+cc2477cf4d596a88b349257cba3ef356 # md5 - AZORult spreads as a fake ProtonVPN installer (191)
+573ff02981a5c70ae6b2594b45aa7caa # md5 - AZORult spreads as a fake ProtonVPN installer (191)
+c961a3e3bd646ed0732e867310333978 # md5 - AZORult spreads as a fake ProtonVPN installer (191)
+2a98e06c3310309c58fb149a8dc7392c # md5 - AZORult spreads as a fake ProtonVPN installer (191)
+f21c21c2fceac5118ebf088653275b4f # md5 - AZORult spreads as a fake ProtonVPN installer (191)
+0ae37532a7bbce03e7686eee49441c41 # md5 - AZORult spreads as a fake ProtonVPN installer (191)
+974b6559a6b45067b465050e5002214b # md5 - AZORult spreads as a fake ProtonVPN installer (191)
+7966c2c546b71e800397a67f942858d0 # md5 - This Is Not a Test: APT41 Initiates Global Intrusion Campaign Using Multiple Exploits (194)
+5909983db4d9023e4098e56361c96a6f # md5 - This Is Not a Test: APT41 Initiates Global Intrusion Campaign Using Multiple Exploits (194)
+3e856162c36b532925c8226b4ed3481c # md5 - This Is Not a Test: APT41 Initiates Global Intrusion Campaign Using Multiple Exploits (194)
+659bd19b562059f3f0cc978e15624fd9 # md5 - This Is Not a Test: APT41 Initiates Global Intrusion Campaign Using Multiple Exploits (194)
+
+```
+#### AlienVault OTX
+
+Rest Endpoint: `/api/v1/indicators/export`
+
+Schema
+```
+{
+  "$schema": "http://json-schema.org/draft-04/schema",
+  "additionalProperties": false,
+  "required": ["count", "next", "results", "previous"],
+  "properties": {
+    "count": {"type": "integer"},
+    "next": {"type": ["string", "null"]},
+    "results": {
+        "type": "array",
+        "items": {
+            "additionalProperties": false,
+            "required": ["indicator", "title", "content", "type", "id", "description"],
+            "properties": {
+                "indicator": {"type": "string"},
+                "title": {"type": ["string", "null"]},
+                "content": {"type": ["string", "null"]},
+                "type": {"type": "string"},
+                "id": {"type": "integer"},
+                "description": {"type": ["string", "null"]}
+            }
+        }
+    },
+    "previous": {"type": ["string", "null"]}
+  }
+}
+```
+
+Example
+```
+{
+    "count": 3,
+    "next": null,
+    "results": [
+        {
+            "indicator": "rustybrooks.com",
+            "description": null,
+            "title": null,
+            "content": "",
+            "type": "domain",
+            "id": 1
+        },
+        {
+            "indicator": "roll20.com",
+            "description": null,
+            "title": null,
+            "content": "",
+            "type": "domain",
+            "id": 3
+        },
+        {
+            "indicator": "redacted.ch",
+            "description": null,
+            "title": null,
+            "content": "",
+            "type": "domain",
+            "id": 6
+        }
+    ],
+    "previous": null
+}
+```
 <!--
 Stage 3: Add more real world example source documents so we have at least 2 total, but ideally 3. Format as described in stage 2.
 -->
@@ -127,13 +378,24 @@ Stage 2: Identifies scope of impact of changes. Are breaking changes required? S
  * ECS project (e.g. docs, tooling)
 The goal here is to research and understand the impact of these changes on users in the community and development teams across Elastic. 2-5 sentences each.
 -->
+ * Ingestion mechanism: Primary ingestion mechanisms will be Filebeat modules and Ingest Packages. There will be no impact on ingestion mechanisms.
+ * Usage mechanism: The primary use of the proposed ECS fields and values is through Elastic Security solution. In 7.10 we released Indicator match rule to support the use of the proposed new fields and values.
 
 ## Concerns
 
 <!--
 Stage 1: Identify potential concerns, implementation challenges, or complexity. Spend some time on this. Play devil's advocate. Try to identify the sort of non-obvious challenges that tend to surface later. The goal here is to surface risks early, allow everyone the time to work through them, and ultimately document resolution for posterity's sake.
 -->
-There is a proposal to nest all IoC fields under `threat.ioc.*` instead of the current `threat.* structure.` This would make it consistent with taxonomy structure for `threat.tactic.*` and `threat.techinique.*` . This needs to be resovled in Stage 2 of the RFC process.
+
+1. How to best represent malware{name,family,type}. Current proposal is to use `threat.indicator.classification` to describe threat delivery (Hacktool etc.) and family name.
+1. Field types (Ref: https://github.com/elastic/ecs/pull/1127#issuecomment-776126293)
+  - `threatintel.indicator.*` (Filebeat module) will be normal field type and will be deprecated when nested field types are better supported in Kibana
+  - `threat.indicator.*` (actual threat ECS fieldset) will be nested now and used for enriched doc
+  - Once there is better support for nested field types in Kibana, there will be a migration to `threat.indicator.*`
+  - Do we see this development affecting the timeline for this RFC's advancement (https://github.com/elastic/ecs/pull/1127#issuecomment-777766608)?
+    >I imagine many users interested in threat.indicator.* fields are looking to map their own indicator sources to threat.indicator.* and then ingest those sources for use with indicator match rules. Is this something that will still be possible until the migration to threat.indicator.* happens?
+    >
+    >Including the threat.indicator.* fields in ECS would still document the fields as soon as they are implemented in the signals indices. Yet, until we feel confident encouraging using these fields to normalize users' data, I'm worried about the confusion and experience that would result.
 
 <!--
 Stage 2: Document new concerns or resolutions to previously listed concerns. It's not critical that all concerns have resolutions at this point, but it would be helpful if resolutions were taking shape for the most significant concerns.
@@ -160,11 +422,25 @@ The following are the people that consulted on the contents of this RFC.
 * @shimonmodi | author
 * @peasead | subject matter expert
 * @MikePaquette | subject matter expert
+* @devonakerr | sponsor
 
 
 ## References
 
-[Threat Intel Field Set Draft](https://docs.google.com/spreadsheets/d/1hS3tF-sGmwnKb7uUGLo3Rng_q6EFgwo6UCae8Sp4E-g/edit?usp=sharing)
+* [Threat Intel Field Set Draft](https://docs.google.com/spreadsheets/d/1hS3tF-sGmwnKb7uUGLo3Rng_q6EFgwo6UCae8Sp4E-g/edit?usp=sharing)
+* [STIX Cyber Observable data model](https://docs.oasis-open.org/cti/stix/v2.1/cs01/stix-v2.1-cs01.html#_mlbmudhl16lr)
+
+Some examples of open source intelligence are:
+  * [Abuse.ch Feodo Tracker](https://feodotracker.abuse.ch/downloads/ipblocklist.csv) - see below for sample data
+  * [Botvrij](https://botvrij.eu/data/)
+  * [Phish Tank](https://www.phishtank.com/)
+  * [AlienVault OTX](https://otx.alienvault.com/api)
+
+Some examples of commercial intelligence include:
+  * [Anomali ThreatStream](https://www.anomali.com/products/threatstream)
+  * [Virus Total](https://www.virustotal.com/gui/intelligence-overview)
+  * [Domain Tools](https://www.domaintools.com/products/api-integration/)
+
 <!-- Insert any links appropriate to this RFC in this section. -->
 
 ### RFC Pull Requests
@@ -174,6 +450,8 @@ The following are the people that consulted on the contents of this RFC.
 * Stage 0: https://github.com/elastic/ecs/pull/986
 * Stage 1: https://github.com/elastic/ecs/pull/1037
   * Stage 1 correction: https://github.com/elastic/ecs/pull/1100
+* Stage 1 (originally stage 2 prior to removal of RFC stage 4): https://github.com/elastic/ecs/pull/1127
+
 
 <!--
 * Stage 1: https://github.com/elastic/ecs/pull/NNN
diff --git a/rfcs/text/0008/as.yml b/rfcs/text/0008/as.yml
new file mode 100644
index 0000000000..df6983d616
--- /dev/null
+++ b/rfcs/text/0008/as.yml
@@ -0,0 +1,5 @@
+---
+- name: as
+  reusable:
+    expected:
+      - threat.indicator
diff --git a/rfcs/text/0008/file.yml b/rfcs/text/0008/file.yml
new file mode 100644
index 0000000000..94a4176eaa
--- /dev/null
+++ b/rfcs/text/0008/file.yml
@@ -0,0 +1,5 @@
+---
+- name: file
+  reusable:
+    expected:
+      - threat.indicator
diff --git a/rfcs/text/0008/geo.yml b/rfcs/text/0008/geo.yml
new file mode 100644
index 0000000000..7391460e84
--- /dev/null
+++ b/rfcs/text/0008/geo.yml
@@ -0,0 +1,5 @@
+---
+- name: geo
+  reusable:
+    expected:
+      - threat.indicator
diff --git a/rfcs/text/0008/hash.yml b/rfcs/text/0008/hash.yml
new file mode 100644
index 0000000000..957ad48503
--- /dev/null
+++ b/rfcs/text/0008/hash.yml
@@ -0,0 +1,5 @@
+---
+- name: hash
+  reusable:
+    expected:
+      - threat.indicator
diff --git a/rfcs/text/0008/pe.yml b/rfcs/text/0008/pe.yml
new file mode 100644
index 0000000000..fb24283938
--- /dev/null
+++ b/rfcs/text/0008/pe.yml
@@ -0,0 +1,5 @@
+---
+- name: pe
+  reusable:
+    expected:
+      - threat.indicator
diff --git a/rfcs/text/0008/registry.yml b/rfcs/text/0008/registry.yml
new file mode 100644
index 0000000000..71b42ec4ca
--- /dev/null
+++ b/rfcs/text/0008/registry.yml
@@ -0,0 +1,5 @@
+---
+- name: registry
+  reusable:
+    expected:
+      - threat.indicator
diff --git a/rfcs/text/0008/threat.yml b/rfcs/text/0008/threat.yml
new file mode 100644
index 0000000000..5c55961a07
--- /dev/null
+++ b/rfcs/text/0008/threat.yml
@@ -0,0 +1,196 @@
+---
+- name: threat
+
+  fields:
+
+  - name: indicator.first_seen
+    level: extended
+    type: date
+    short: Date/time indicator was first reported.
+    description: >
+      The date and time when intelligence source first reported sighting this indicator.
+
+    example: "2020-11-05T17:25:47.000Z"
+
+  - name: indicator.last_seen
+    level: extended
+    type: date
+    short: Date/time indicator was last reported.
+    description: >
+      The date and time when intelligence source last reported sighting this indicator.
+
+    example: "2020-11-05T17:25:47.000Z"
+
+  - name: indicator.sightings
+    level: extended
+    type: long
+    short: Number of times indicator observed
+    description: >
+      Number of times this indicator was observed conducting threat activity.
+
+    example: 20
+
+  - name: indicator.type
+    level: extended
+    type: keyword
+    short: Type of indicator
+    description: >
+      Type of indicator as represented by Cyber Observable in STIX 2.0.
+
+      Expected values
+        * autonomous-system
+        * artifact
+        * directory
+        * domain-name
+        * email-addr
+        * file
+        * ipv4-addr
+        * ipv6-addr
+        * mac-addr
+        * mutex
+        * process
+        * software
+        * url
+        * user-account
+        * windows-registry-key
+        * x-509-certificate
+
+    example: ipv4-addr
+
+  - name: indicator.description
+    level: extended
+    type: wildcard
+    short: Indicator description
+    description: >
+      Describes the type of action conducted by the threat.
+
+    example: IP x.x.x.x was observed delivering the Angler EK.
+
+  - name: indicator.scanner_stats
+    level: extended
+    type: long
+    short: Scanner statistics
+    description: >
+      Count of AV/EDR vendors that successfully detected malicious file or URL.
+
+    example: 4
+
+  - name: indicator.provider
+    level: extended
+    type: keyword
+    description: >
+      Identifies the name of the intelligence provider.
+
+    example: VirusTotal
+
+  - name: indicator.confidence
+    level: extended
+    type: keyword
+    short: Indicator confidence rating
+    description: >
+      Identifies the confidence rating assigned by the provider using STIX confidence scales.
+
+      Expected values:
+        * Not Specified, None, Low, Medium, High
+        * 0-10
+        * Admirality Scale (1-6)
+        * DNI Scale (5-95)
+        * WEP Scale (Impossible - Certain)
+
+    example: High
+
+  - name: indicator.module
+    level: extended
+    type: keyword
+    short: Indicator module
+    description: >
+      Identifies the name of specific module this data is coming from.
+
+    example: threatintel
+
+  - name: indicator.dataset
+    level: extended
+    type: keyword
+    short: Indicator dataset
+    description: >
+      Identifies the name of specific dataset from the intelligence source.
+
+    example: threatintel.abusemalware
+
+  - name: indicator.ip
+    level: extended
+    type: ip
+    short: Indicator IP address
+    description: >
+      Identifies a threat indicator as an IP address (irrespective of direction).
+
+    example: 1.2.3.4
+
+  - name: indicator.domain
+    level: extended
+    type: keyword
+    short: Indicator domain name
+    description: >
+      Identifies a threat indicator as a domain (irrespective of direction).
+
+    example: example.com
+
+  - name: indicator.port
+    level: extended
+    type: long
+    short: Indicator port
+    description: >
+      Identifies a threat indicator as a port number (irrespective of direction).
+
+    example: 443
+
+  - name: indicator.email.address
+    level: extended
+    type: keyword
+    short: Indicator email address
+    description: >
+      Identifies a threat indicator as an email address (irrespective of direction).
+
+    example: phish@example.com
+
+  - name: indicator.marking.tlp
+    level: extended
+    type: keyword
+    short: Indicator TLP marking
+    description: >
+      Traffic Light Protocol sharing markings.
+
+      Expected values are:
+        * White
+        * Green
+        * Amber
+        * Red
+
+    example: White
+
+  - name: indicator.matched.atomic
+    level: extended
+    type: keyword
+    short: Indicator atomic match
+    description: >
+      Identifies the atomic indicator that matched a local environment endpoint or network event.
+
+    example: example.com
+
+  - name: indicator.matched.field
+    level: extended
+    type: keyword
+    short: Indicator field match
+    description: >
+      Identifies the field of the atomic indicator that matched a local environment endpoint or network event.
+
+    example: file.hash.sha256
+
+  - name: indicator.matched.type
+    level: extended
+    type: keyword
+    short: Indicator type match
+    description: >
+      Identifies the type of the atomic indicator that matched a local environment endpoint or network event.
+
+    example: domain-name
diff --git a/rfcs/text/0008/url.yml b/rfcs/text/0008/url.yml
new file mode 100644
index 0000000000..63e0138df4
--- /dev/null
+++ b/rfcs/text/0008/url.yml
@@ -0,0 +1,5 @@
+---
+- name: url
+  reusable:
+    expected:
+      - threat.indicator
diff --git a/rfcs/text/0008/x509.yml b/rfcs/text/0008/x509.yml
new file mode 100644
index 0000000000..c74d829ece
--- /dev/null
+++ b/rfcs/text/0008/x509.yml
@@ -0,0 +1,5 @@
+---
+- name: x509
+  reusable:
+    expected:
+      - threat.indicator