diff --git a/core/pom.xml b/core/pom.xml
index 952a2662b4..32ab3772c6 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -28,18 +28,11 @@
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
-            <artifactId>cucumber-gherkin-vintage</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>gherkin</artifactId>
-            <version>${gherkin-vintage.version}</version>
+            <artifactId>cucumber-gherkin-messages</artifactId>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
-            <artifactId>gherkin-jvm-deps</artifactId>
-            <version>${gherkin-vintage-jvm-deps.version}</version>
+            <artifactId>messages</artifactId>
         </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
@@ -61,6 +54,10 @@
             <groupId>io.cucumber</groupId>
             <artifactId>docstring</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>html-formatter</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apiguardian</groupId>
             <artifactId>apiguardian-api</artifactId>
diff --git a/core/src/main/java/io/cucumber/core/eventbus/AbstractEventBus.java b/core/src/main/java/io/cucumber/core/eventbus/AbstractEventBus.java
index 50d5c4dd46..4cd9ca7ea5 100644
--- a/core/src/main/java/io/cucumber/core/eventbus/AbstractEventBus.java
+++ b/core/src/main/java/io/cucumber/core/eventbus/AbstractEventBus.java
@@ -1,16 +1,14 @@
 package io.cucumber.core.eventbus;
 
-import io.cucumber.plugin.event.Event;
-
 public abstract class AbstractEventBus extends AbstractEventPublisher implements EventBus {
 
     @Override
-    public void send(Event event) {
+    public <T> void send(T event) {
         super.send(event);
     }
 
     @Override
-    public void sendAll(Iterable<Event> queue) {
+    public <T> void sendAll(Iterable<T> queue) {
         super.sendAll(queue);
     }
 }
diff --git a/core/src/main/java/io/cucumber/core/eventbus/AbstractEventPublisher.java b/core/src/main/java/io/cucumber/core/eventbus/AbstractEventPublisher.java
index b280773dcc..ddd12f88e7 100644
--- a/core/src/main/java/io/cucumber/core/eventbus/AbstractEventPublisher.java
+++ b/core/src/main/java/io/cucumber/core/eventbus/AbstractEventPublisher.java
@@ -10,10 +10,10 @@
 import java.util.Map;
 
 public abstract class AbstractEventPublisher implements EventPublisher {
-    protected final Map<Class<? extends Event>, List<EventHandler>> handlers = new HashMap<>();
+    protected final Map<Class<?>, List<EventHandler>> handlers = new HashMap<>();
 
     @Override
-    public final <T extends Event> void registerHandlerFor(Class<T> eventType, EventHandler<T> handler) {
+    public final <T> void registerHandlerFor(Class<T> eventType, EventHandler<T> handler) {
         if (handlers.containsKey(eventType)) {
             handlers.get(eventType).add(handler);
         } else {
@@ -24,15 +24,15 @@ public final <T extends Event> void registerHandlerFor(Class<T> eventType, Event
     }
 
     @Override
-    public final <T extends Event> void removeHandlerFor(Class<T> eventType, EventHandler<T> handler) {
+    public final <T> void removeHandlerFor(Class<T> eventType, EventHandler<T> handler) {
         if (handlers.containsKey(eventType)) {
             handlers.get(eventType).remove(handler);
         }
     }
 
 
-    protected void send(Event event) {
-        if (handlers.containsKey(Event.class)) {
+    protected <T> void send(T event) {
+        if (handlers.containsKey(Event.class) && event instanceof Event) {
             for (EventHandler handler : handlers.get(Event.class)) {
                 //noinspection unchecked: protected by registerHandlerFor
                 handler.receive(event);
@@ -47,8 +47,8 @@ protected void send(Event event) {
         }
     }
 
-    protected void sendAll(Iterable<Event> events) {
-        for (Event event : events) {
+    protected <T> void sendAll(Iterable<T> events) {
+        for (T event : events) {
             send(event);
         }
     }
diff --git a/core/src/main/java/io/cucumber/core/eventbus/EventBus.java b/core/src/main/java/io/cucumber/core/eventbus/EventBus.java
index 4df0859a1a..8ef9384b33 100644
--- a/core/src/main/java/io/cucumber/core/eventbus/EventBus.java
+++ b/core/src/main/java/io/cucumber/core/eventbus/EventBus.java
@@ -3,7 +3,6 @@
 import java.time.Instant;
 import java.util.UUID;
 
-import io.cucumber.plugin.event.Event;
 import io.cucumber.plugin.event.EventPublisher;
 
 public interface EventBus extends EventPublisher {
@@ -12,8 +11,8 @@ public interface EventBus extends EventPublisher {
 
     UUID generateId();
 
-    void send(Event event);
+    <T> void send(T event);
 
-    void sendAll(Iterable<Event> queue);
+    <T> void sendAll(Iterable<T> queue);
 
 }
diff --git a/core/src/main/java/io/cucumber/core/options/PluginOption.java b/core/src/main/java/io/cucumber/core/options/PluginOption.java
index 0119d89bd5..c1ec53b9bd 100644
--- a/core/src/main/java/io/cucumber/core/options/PluginOption.java
+++ b/core/src/main/java/io/cucumber/core/options/PluginOption.java
@@ -4,9 +4,9 @@
 import io.cucumber.core.logging.Logger;
 import io.cucumber.core.logging.LoggerFactory;
 import io.cucumber.core.plugin.DefaultSummaryPrinter;
-import io.cucumber.core.plugin.HTMLFormatter;
-import io.cucumber.core.plugin.JSONFormatter;
+import io.cucumber.core.plugin.HtmlFormatter;
 import io.cucumber.core.plugin.JUnitFormatter;
+import io.cucumber.core.plugin.MessageFormatter;
 import io.cucumber.core.plugin.NullSummaryPrinter;
 import io.cucumber.core.plugin.Options;
 import io.cucumber.core.plugin.PrettyFormatter;
@@ -25,6 +25,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.function.Supplier;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -33,23 +34,35 @@ public class PluginOption implements Options.Plugin {
     private static final Logger log = LoggerFactory.getLogger(PluginOption.class);
 
     private static final Pattern PLUGIN_WITH_ARGUMENT_PATTERN = Pattern.compile("([^:]+):(.*)");
-    private static final HashMap<String, Class<? extends Plugin>> PLUGIN_CLASSES = new HashMap<String, Class<? extends Plugin>>() {{
-        put("default_summary", DefaultSummaryPrinter.class);
-        put("html", HTMLFormatter.class);
-        put("json", JSONFormatter.class);
-        put("junit", JUnitFormatter.class);
-        put("null_summary", NullSummaryPrinter.class);
-        put("pretty", PrettyFormatter.class);
-        put("progress", ProgressFormatter.class);
-        put("rerun", RerunFormatter.class);
-        put("summary", DefaultSummaryPrinter.class);
-        put("testng", TestNGFormatter.class);
-        put("timeline", TimelineFormatter.class);
-        put("unused", UnusedStepsSummaryPrinter.class);
-        put("usage", UsageFormatter.class);
-        put("teamcity", TeamCityPlugin.class);
+    private static final HashMap<String, Supplier<Class<? extends Plugin>>> PLUGIN_CLASSES = new HashMap<String, Supplier<Class<? extends Plugin>>>() {{
+        put("default_summary", () -> DefaultSummaryPrinter.class);
+        put("html", () -> HtmlFormatter.class);
+        put("json", () -> loadClassFromGherkinVintage("io.cucumber.core.gherkin.vintage.JsonFormatter"));
+        put("junit", () -> JUnitFormatter.class);
+        put("null_summary", () -> NullSummaryPrinter.class);
+        put("pretty", () -> PrettyFormatter.class);
+        put("progress", () -> ProgressFormatter.class);
+        put("message", () -> MessageFormatter.class);
+        put("rerun", () -> RerunFormatter.class);
+        put("summary", () -> DefaultSummaryPrinter.class);
+        put("testng", () -> TestNGFormatter.class);
+        put("timeline", () -> TimelineFormatter.class);
+        put("unused", () -> UnusedStepsSummaryPrinter.class);
+        put("usage", () -> UsageFormatter.class);
+        put("teamcity", () -> TeamCityPlugin.class);
     }};
 
+    private static Class<? extends Plugin> loadClassFromGherkinVintage(String className) {
+        try {
+            Class<?> aClass = Thread.currentThread().getContextClassLoader().loadClass(className);
+            return (Class<? extends Plugin>) aClass;
+        } catch (ClassNotFoundException | NoClassDefFoundError e) {
+            throw new CucumberException("" +
+                "Couldn't load plugin class: " + className + "\n" +
+                "Make sure `cucumber-gherkin-vintage` is available on the classpath", e);
+        }
+    }
+
     // Replace IDEA plugin with TeamCity
     private static final Set<String> INCOMPATIBLE_INTELLIJ_IDEA_PLUGIN_CLASSES = new HashSet<String>() {{
         add("org.jetbrains.plugins.cucumber.java.run.CucumberJvmSMFormatter");
@@ -77,6 +90,29 @@ private PluginOption(String pluginString, Class<? extends Plugin> pluginClass, S
         this.argument = argument;
     }
 
+    @Override
+    public Class<? extends Plugin> pluginClass() {
+        return pluginClass;
+    }
+
+    @Override
+    public String argument() {
+        return argument;
+    }
+
+    @Override
+    public String pluginString() {
+        return pluginString;
+    }
+
+    boolean isFormatter() {
+        return EventListener.class.isAssignableFrom(pluginClass) || ConcurrentEventListener.class.isAssignableFrom(pluginClass);
+    }
+
+    boolean isSummaryPrinter() {
+        return SummaryPrinter.class.isAssignableFrom(pluginClass);
+    }
+
     public static PluginOption parse(String pluginArgumentPattern) {
         Matcher pluginWithFile = PLUGIN_WITH_ARGUMENT_PATTERN.matcher(pluginArgumentPattern);
         if (!pluginWithFile.matches()) {
@@ -97,7 +133,7 @@ private static Class<? extends Plugin> parsePluginName(String pluginName) {
             return TeamCityPlugin.class;
         }
 
-        Class<? extends Plugin> pluginClass = PLUGIN_CLASSES.get(pluginName);
+        Class<? extends Plugin> pluginClass = PLUGIN_CLASSES.get(pluginName).get();
         if (pluginClass == null) {
             pluginClass = loadClass(pluginName);
         }
@@ -118,28 +154,5 @@ private static Class<? extends Plugin> loadClass(String className) {
         }
     }
 
-    @Override
-    public Class<? extends Plugin> pluginClass() {
-        return pluginClass;
-    }
-
-    @Override
-    public String argument() {
-        return argument;
-    }
-
-    @Override
-    public String pluginString() {
-        return pluginString;
-    }
-
-    boolean isFormatter() {
-        return EventListener.class.isAssignableFrom(pluginClass) || ConcurrentEventListener.class.isAssignableFrom(pluginClass);
-    }
-
-    boolean isSummaryPrinter() {
-        return SummaryPrinter.class.isAssignableFrom(pluginClass);
-    }
-
 
 }
diff --git a/core/src/main/java/io/cucumber/core/options/RuntimeOptionsParser.java b/core/src/main/java/io/cucumber/core/options/RuntimeOptionsParser.java
index 31f0145967..a2ad4699d1 100644
--- a/core/src/main/java/io/cucumber/core/options/RuntimeOptionsParser.java
+++ b/core/src/main/java/io/cucumber/core/options/RuntimeOptionsParser.java
@@ -1,12 +1,12 @@
 package io.cucumber.core.options;
 
-import gherkin.GherkinDialect;
-import gherkin.GherkinDialectProvider;
-import gherkin.IGherkinDialectProvider;
 import io.cucumber.core.exception.CucumberException;
 import io.cucumber.core.feature.FeatureWithLines;
 import io.cucumber.core.feature.GluePath;
 import io.cucumber.datatable.DataTable;
+import io.cucumber.gherkin.GherkinDialect;
+import io.cucumber.gherkin.GherkinDialectProvider;
+import io.cucumber.gherkin.IGherkinDialectProvider;
 
 import java.io.BufferedReader;
 import java.io.InputStream;
diff --git a/core/src/main/java/io/cucumber/core/plugin/HTMLFormatter.java b/core/src/main/java/io/cucumber/core/plugin/HTMLFormatter.java
deleted file mode 100644
index f9d3cc9ba3..0000000000
--- a/core/src/main/java/io/cucumber/core/plugin/HTMLFormatter.java
+++ /dev/null
@@ -1,516 +0,0 @@
-package io.cucumber.core.plugin;
-
-import gherkin.ast.Background;
-import gherkin.ast.DataTable;
-import gherkin.ast.DocString;
-import gherkin.ast.Examples;
-import gherkin.ast.Feature;
-import gherkin.ast.Node;
-import gherkin.ast.ScenarioDefinition;
-import gherkin.ast.ScenarioOutline;
-import gherkin.ast.Step;
-import gherkin.ast.TableCell;
-import gherkin.ast.TableRow;
-import gherkin.ast.Tag;
-import gherkin.deps.com.google.gson.Gson;
-import gherkin.deps.com.google.gson.GsonBuilder;
-import io.cucumber.core.exception.CucumberException;
-import io.cucumber.plugin.EventListener;
-import io.cucumber.plugin.event.DataTableArgument;
-import io.cucumber.plugin.event.DocStringArgument;
-import io.cucumber.plugin.event.EmbedEvent;
-import io.cucumber.plugin.event.EventPublisher;
-import io.cucumber.plugin.event.HookTestStep;
-import io.cucumber.plugin.event.HookType;
-import io.cucumber.plugin.event.PickleStepTestStep;
-import io.cucumber.plugin.event.Result;
-import io.cucumber.plugin.event.StepArgument;
-import io.cucumber.plugin.event.TestCase;
-import io.cucumber.plugin.event.TestCaseStarted;
-import io.cucumber.plugin.event.TestRunFinished;
-import io.cucumber.plugin.event.TestSourceRead;
-import io.cucumber.plugin.event.TestStepFinished;
-import io.cucumber.plugin.event.TestStepStarted;
-import io.cucumber.plugin.event.WriteEvent;
-
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.Locale.ROOT;
-
-public final class HTMLFormatter implements EventListener {
-    private static final Gson gson = new GsonBuilder().setPrettyPrinting().create();
-    private static final String JS_FORMATTER_VAR = "formatter";
-    private static final String JS_REPORT_FILENAME = "report.js";
-    private static final String[] TEXT_ASSETS = new String[]{
-        "/io/cucumber/core/plugin/html/formatter.js",
-        "/io/cucumber/core/plugin/html/index.html",
-        "/io/cucumber/core/plugin/html/jquery-3.4.1.min.js",
-        "/io/cucumber/core/plugin/html/style.css"
-    };
-    private static final Map<String, String> MIME_TYPES_EXTENSIONS = new HashMap<String, String>() {
-        {
-            put("image/bmp", "bmp");
-            put("image/gif", "gif");
-            put("image/jpeg", "jpg");
-            put("image/png", "png");
-            put("image/svg+xml", "svg");
-            put("video/ogg", "ogg");
-        }
-    };
-
-    private final TestSourcesModel testSources = new TestSourcesModel();
-    private final URL htmlReportDir;
-    private final NiceAppendable jsOut;
-
-    private boolean firstFeature = true;
-    private URI currentFeatureFile;
-    private Map<String, Object> currentTestCaseMap;
-    private ScenarioOutline currentScenarioOutline;
-    private Examples currentExamples;
-    private int embeddedIndex;
-
-    @SuppressWarnings("WeakerAccess") // Used by PluginFactory
-    public HTMLFormatter(URL htmlReportDir) {
-        this(htmlReportDir, createJsOut(htmlReportDir));
-    }
-
-    HTMLFormatter(URL htmlReportDir, NiceAppendable jsOut) {
-        this.htmlReportDir = htmlReportDir;
-        this.jsOut = jsOut;
-    }
-
-    @Override
-    public void setEventPublisher(EventPublisher publisher) {
-        publisher.registerHandlerFor(TestSourceRead.class, this::handleTestSourceRead);
-        publisher.registerHandlerFor(TestCaseStarted.class, this::handleTestCaseStarted);
-        publisher.registerHandlerFor(TestStepStarted.class, this::handleTestStepStarted);
-        publisher.registerHandlerFor(TestStepFinished.class, this::handleTestStepFinished);
-        publisher.registerHandlerFor(EmbedEvent.class, this::handleEmbed);
-        publisher.registerHandlerFor(WriteEvent.class, this::handleWrite);
-        publisher.registerHandlerFor(TestRunFinished.class, event -> finishReport());
-    }
-
-    private void handleTestSourceRead(TestSourceRead event) {
-        testSources.addTestSourceReadEvent(event.getUri(), event);
-    }
-
-    private void handleTestCaseStarted(TestCaseStarted event) {
-        if (firstFeature) {
-            jsOut.append("$(document).ready(function() {").append("var ")
-                .append(JS_FORMATTER_VAR).append(" = new CucumberHTML.DOMFormatter($('.cucumber-report'));");
-            firstFeature = false;
-        }
-        handleStartOfFeature(event.getTestCase());
-        handleScenarioOutline(event.getTestCase());
-        currentTestCaseMap = createTestCase(event.getTestCase());
-        if (testSources.hasBackground(currentFeatureFile, event.getTestCase().getLine())) {
-            jsFunctionCall("background", createBackground(event.getTestCase()));
-        } else {
-            jsFunctionCall("scenario", currentTestCaseMap);
-            currentTestCaseMap = null;
-        }
-    }
-
-    private void handleTestStepStarted(TestStepStarted event) {
-        if (event.getTestStep() instanceof PickleStepTestStep) {
-            PickleStepTestStep testStep = (PickleStepTestStep) event.getTestStep();
-            if (isFirstStepAfterBackground(testStep)) {
-                jsFunctionCall("scenario", currentTestCaseMap);
-                currentTestCaseMap = null;
-            }
-            jsFunctionCall("step", createTestStep(testStep));
-            jsFunctionCall("match", createMatchMap((PickleStepTestStep) event.getTestStep()));
-        }
-    }
-
-    private void handleTestStepFinished(TestStepFinished event) {
-        if (event.getTestStep() instanceof PickleStepTestStep) {
-            jsFunctionCall("result", createResultMap(event.getResult()));
-        } else if (event.getTestStep() instanceof HookTestStep) {
-            HookTestStep hookTestStep = (HookTestStep) event.getTestStep();
-            jsFunctionCall(getFunctionName(hookTestStep), createResultMap(event.getResult()));
-        } else {
-            throw new IllegalStateException();
-        }
-    }
-
-    private String getFunctionName(HookTestStep hookTestStep) {
-        HookType hookType = hookTestStep.getHookType();
-        switch (hookType) {
-            case BEFORE:
-                return "before";
-            case AFTER:
-                return "after";
-            case BEFORE_STEP:
-                return "beforestep";
-            case AFTER_STEP:
-                return "afterstep";
-            default:
-                throw new IllegalArgumentException(hookType.name());
-        }
-    }
-
-    private void handleEmbed(EmbedEvent event) {
-        String mediaType = event.getMediaType();
-        if (mediaType.startsWith("text/")) {
-            // just pass straight to the plugin to output in the html
-            jsFunctionCall("embedding", mediaType, new String(event.getData()), event.getName());
-        } else {
-            // Creating a file instead of using data urls to not clutter the js file
-            String extension = MIME_TYPES_EXTENSIONS.get(mediaType);
-            if (extension != null) {
-                StringBuilder fileName = new StringBuilder("embedded").append(embeddedIndex++).append(".").append(extension);
-                writeBytesToURL(event.getData(), toUrl(fileName.toString()));
-                jsFunctionCall("embedding", mediaType, fileName, event.getName());
-            }
-        }
-    }
-
-    private void handleWrite(WriteEvent event) {
-        jsFunctionCall("write", event.getText());
-    }
-
-    private void finishReport() {
-        if (!firstFeature) {
-            jsOut.append("});");
-            copyReportFiles();
-        }
-        jsOut.close();
-    }
-
-    private void handleStartOfFeature(TestCase testCase) {
-        if (currentFeatureFile == null || !currentFeatureFile.equals(testCase.getUri())) {
-            currentFeatureFile = testCase.getUri();
-            jsFunctionCall("uri", TestSourcesModel.relativize(currentFeatureFile));
-            jsFunctionCall("feature", createFeature(testCase));
-        }
-    }
-
-    private Map<String, Object> createFeature(TestCase testCase) {
-        Map<String, Object> featureMap = new HashMap<>();
-        Feature feature = testSources.getFeature(testCase.getUri());
-        if (feature != null) {
-            featureMap.put("keyword", feature.getKeyword());
-            featureMap.put("name", feature.getName());
-            featureMap.put("description", feature.getDescription() != null ? feature.getDescription() : "");
-            if (!feature.getTags().isEmpty()) {
-                featureMap.put("tags", createTagList(feature.getTags()));
-            }
-        }
-        return featureMap;
-    }
-
-    private List<Map<String, Object>> createTagList(List<Tag> tags) {
-        List<Map<String, Object>> tagList = new ArrayList<>();
-        for (Tag tag : tags) {
-            Map<String, Object> tagMap = new HashMap<>();
-            tagMap.put("name", tag.getName());
-            tagList.add(tagMap);
-        }
-        return tagList;
-    }
-
-    private void handleScenarioOutline(TestCase testCase) {
-        TestSourcesModel.AstNode astNode = testSources.getAstNode(currentFeatureFile, testCase.getLine());
-        if (TestSourcesModel.isScenarioOutlineScenario(astNode)) {
-            ScenarioOutline scenarioOutline = (ScenarioOutline) TestSourcesModel.getScenarioDefinition(astNode);
-            if (currentScenarioOutline == null || !currentScenarioOutline.equals(scenarioOutline)) {
-                currentScenarioOutline = scenarioOutline;
-                jsFunctionCall("scenarioOutline", createScenarioOutline(currentScenarioOutline));
-                addOutlineStepsToReport(scenarioOutline);
-            }
-            Examples examples = (Examples) astNode.parent.node;
-            if (currentExamples == null || !currentExamples.equals(examples)) {
-                currentExamples = examples;
-                jsFunctionCall("examples", createExamples(currentExamples));
-            }
-        } else {
-            currentScenarioOutline = null;
-            currentExamples = null;
-        }
-    }
-
-    private Map<String, Object> createScenarioOutline(ScenarioOutline scenarioOutline) {
-        Map<String, Object> scenarioOutlineMap = new HashMap<>();
-        scenarioOutlineMap.put("name", scenarioOutline.getName());
-        scenarioOutlineMap.put("keyword", scenarioOutline.getKeyword());
-        scenarioOutlineMap.put("description", scenarioOutline.getDescription() != null ? scenarioOutline.getDescription() : "");
-        if (!scenarioOutline.getTags().isEmpty()) {
-            scenarioOutlineMap.put("tags", createTagList(scenarioOutline.getTags()));
-        }
-        return scenarioOutlineMap;
-    }
-
-    private void addOutlineStepsToReport(ScenarioOutline scenarioOutline) {
-        for (Step step : scenarioOutline.getSteps()) {
-            Map<String, Object> stepMap = new HashMap<>();
-            stepMap.put("name", step.getText());
-            stepMap.put("keyword", step.getKeyword());
-            if (step.getArgument() != null) {
-                Node argument = step.getArgument();
-                if (argument instanceof DocString) {
-                    stepMap.put("doc_string", createDocStringMap((DocString) argument));
-                } else if (argument instanceof DataTable) {
-                    stepMap.put("rows", createDataTableList((DataTable) argument));
-                }
-            }
-            jsFunctionCall("step", stepMap);
-        }
-    }
-
-    private Map<String, Object> createDocStringMap(DocString docString) {
-        Map<String, Object> docStringMap = new HashMap<>();
-        docStringMap.put("value", docString.getContent());
-        return docStringMap;
-    }
-
-    private List<Map<String, Object>> createDataTableList(DataTable dataTable) {
-        List<Map<String, Object>> rowList = new ArrayList<>();
-        for (TableRow row : dataTable.getRows()) {
-            rowList.add(createRowMap(row));
-        }
-        return rowList;
-    }
-
-    private Map<String, Object> createRowMap(TableRow row) {
-        Map<String, Object> rowMap = new HashMap<>();
-        rowMap.put("cells", createCellList(row));
-        return rowMap;
-    }
-
-    private List<String> createCellList(TableRow row) {
-        List<String> cells = new ArrayList<>();
-        for (TableCell cell : row.getCells()) {
-            cells.add(cell.getValue());
-        }
-        return cells;
-    }
-
-    private Map<String, Object> createExamples(Examples examples) {
-        Map<String, Object> examplesMap = new HashMap<>();
-        examplesMap.put("name", examples.getName());
-        examplesMap.put("keyword", examples.getKeyword());
-        examplesMap.put("description", examples.getDescription() != null ? examples.getDescription() : "");
-        List<Map<String, Object>> rowList = new ArrayList<>();
-        rowList.add(createRowMap(examples.getTableHeader()));
-        for (TableRow row : examples.getTableBody()) {
-            rowList.add(createRowMap(row));
-        }
-        examplesMap.put("rows", rowList);
-        if (!examples.getTags().isEmpty()) {
-            examplesMap.put("tags", createTagList(examples.getTags()));
-        }
-        return examplesMap;
-    }
-
-    private Map<String, Object> createTestCase(TestCase testCase) {
-        Map<String, Object> testCaseMap = new HashMap<>();
-        testCaseMap.put("name", testCase.getName());
-        TestSourcesModel.AstNode astNode = testSources.getAstNode(currentFeatureFile, testCase.getLine());
-        if (astNode != null) {
-            ScenarioDefinition scenarioDefinition = TestSourcesModel.getScenarioDefinition(astNode);
-            testCaseMap.put("keyword", scenarioDefinition.getKeyword());
-            testCaseMap.put("description", scenarioDefinition.getDescription() != null ? scenarioDefinition.getDescription() : "");
-        }
-        if (!testCase.getTags().isEmpty()) {
-            List<Map<String, Object>> tagList = new ArrayList<>();
-            for (String tag : testCase.getTags()) {
-                Map<String, Object> tagMap = new HashMap<>();
-                tagMap.put("name", tag);
-                tagList.add(tagMap);
-            }
-            testCaseMap.put("tags", tagList);
-        }
-        return testCaseMap;
-    }
-
-    private Map<String, Object> createBackground(TestCase testCase) {
-        TestSourcesModel.AstNode astNode = testSources.getAstNode(currentFeatureFile, testCase.getLine());
-        if (astNode != null) {
-            Background background = TestSourcesModel.getBackgroundForTestCase(astNode);
-            Map<String, Object> testCaseMap = new HashMap<>();
-            testCaseMap.put("name", background.getName());
-            testCaseMap.put("keyword", background.getKeyword());
-            testCaseMap.put("description", background.getDescription() != null ? background.getDescription() : "");
-            return testCaseMap;
-        }
-        return null;
-    }
-
-    private boolean isFirstStepAfterBackground(PickleStepTestStep testStep) {
-        TestSourcesModel.AstNode astNode = testSources.getAstNode(currentFeatureFile, testStep.getStepLine());
-        if (astNode != null) {
-            return currentTestCaseMap != null && !TestSourcesModel.isBackgroundStep(astNode);
-        }
-        return false;
-    }
-
-    private Map<String, Object> createTestStep(PickleStepTestStep testStep) {
-        Map<String, Object> stepMap = new HashMap<>();
-        stepMap.put("name", testStep.getStepText());
-        StepArgument argument = testStep.getStepArgument();
-        if (argument != null) {
-            if (argument instanceof DocStringArgument) {
-                DocStringArgument docStringArgument = (DocStringArgument) argument;
-                stepMap.put("doc_string", createDocStringMap(docStringArgument));
-            } else if (argument instanceof DataTableArgument) {
-                DataTableArgument dataTableArgument = (DataTableArgument) argument;
-                stepMap.put("rows", createDataTableList(dataTableArgument));
-            }
-        }
-        TestSourcesModel.AstNode astNode = testSources.getAstNode(currentFeatureFile, testStep.getStepLine());
-        if (astNode != null) {
-            Step step = (Step) astNode.node;
-            stepMap.put("keyword", step.getKeyword());
-        }
-
-        return stepMap;
-    }
-
-    private Map<String, Object> createDocStringMap(DocStringArgument docString) {
-        Map<String, Object> docStringMap = new HashMap<>();
-        docStringMap.put("value", docString.getContent());
-        return docStringMap;
-    }
-
-    private List<Map<String, Object>> createDataTableList(DataTableArgument dataTable) {
-        List<Map<String, Object>> rowList = new ArrayList<>();
-        for (List<String> row : dataTable.cells()) {
-            rowList.add(createRowMap(row));
-        }
-        return rowList;
-    }
-
-    private Map<String, Object> createRowMap(List<String> row) {
-        Map<String, Object> rowMap = new HashMap<>();
-        rowMap.put("cells", row);
-        return rowMap;
-    }
-
-    private Map<String, Object> createMatchMap(PickleStepTestStep testStep) {
-        Map<String, Object> matchMap = new HashMap<>();
-        String location = testStep.getCodeLocation();
-        if (location != null) {
-            matchMap.put("location", location);
-        }
-        return matchMap;
-    }
-
-    private Map<String, Object> createResultMap(Result result) {
-        Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("status", result.getStatus().name().toLowerCase(ROOT));
-        if (result.getError() != null) {
-            resultMap.put("error_message", printStackTrace(result.getError()));
-        }
-        return resultMap;
-    }
-
-    private void jsFunctionCall(String functionName, Object... args) {
-        NiceAppendable out = jsOut.append(JS_FORMATTER_VAR + ".").append(functionName).append("(");
-        boolean comma = false;
-        for (Object arg : args) {
-            if (comma) {
-                out.append(", ");
-            }
-            gson.toJson(arg, out);
-            comma = true;
-        }
-        out.append(");").println();
-    }
-
-    private void copyReportFiles() {
-        if (htmlReportDir == null) {
-            return;
-        }
-        for (String textAsset : TEXT_ASSETS) {
-            InputStream textAssetStream = getClass().getResourceAsStream(textAsset);
-            if (textAssetStream == null) {
-                throw new CucumberException("Couldn't find " + textAsset + ". Is cucumber-html on your classpath? Make sure you have the right version.");
-            }
-            String fileName = new File(textAsset).getName();
-            writeStreamToURL(textAssetStream, toUrl(fileName));
-        }
-    }
-
-    private static String printStackTrace(Throwable error) {
-        StringWriter stringWriter = new StringWriter();
-        PrintWriter printWriter = new PrintWriter(stringWriter);
-        error.printStackTrace(printWriter);
-        return stringWriter.toString();
-    }
-
-    private URL toUrl(String fileName) {
-        try {
-            return new URL(htmlReportDir, fileName);
-        } catch (IOException e) {
-            throw new CucumberException(e);
-        }
-    }
-
-    private static void writeStreamToURL(InputStream in, URL url) {
-        OutputStream out = createReportFileOutputStream(url);
-
-        byte[] buffer = new byte[16 * 1024];
-        try {
-            int len = in.read(buffer);
-            while (len != -1) {
-                out.write(buffer, 0, len);
-                len = in.read(buffer);
-            }
-        } catch (IOException e) {
-            throw new CucumberException("Unable to write to report file item: ", e);
-        } finally {
-            closeQuietly(out);
-        }
-    }
-
-    private static void writeBytesToURL(byte[] buf, URL url) throws CucumberException {
-        OutputStream out = createReportFileOutputStream(url);
-        try {
-            out.write(buf);
-        } catch (IOException e) {
-            throw new CucumberException("Unable to write to report file item: ", e);
-        } finally {
-            closeQuietly(out);
-        }
-    }
-
-    private static NiceAppendable createJsOut(URL htmlReportDir) {
-        try {
-            return new NiceAppendable(new OutputStreamWriter(createReportFileOutputStream(new URL(htmlReportDir, JS_REPORT_FILENAME)), UTF_8));
-        } catch (IOException e) {
-            throw new CucumberException(e);
-        }
-    }
-
-    private static OutputStream createReportFileOutputStream(URL url) {
-        try {
-            return new URLOutputStream(url);
-        } catch (IOException e) {
-            throw new CucumberException(e);
-        }
-    }
-
-    private static void closeQuietly(Closeable out) {
-        try {
-            out.close();
-        } catch (IOException ignored) {
-            // go gentle into that good night
-        }
-    }
-
-}
diff --git a/core/src/main/java/io/cucumber/core/plugin/HtmlFormatter.java b/core/src/main/java/io/cucumber/core/plugin/HtmlFormatter.java
new file mode 100644
index 0000000000..c0b78a7e5a
--- /dev/null
+++ b/core/src/main/java/io/cucumber/core/plugin/HtmlFormatter.java
@@ -0,0 +1,43 @@
+package io.cucumber.core.plugin;
+
+import io.cucumber.htmlformatter.MessagesToHtmlWriter;
+import io.cucumber.messages.Messages.Envelope;
+import io.cucumber.plugin.ConcurrentEventListener;
+import io.cucumber.plugin.event.EventPublisher;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+
+public final class HtmlFormatter implements ConcurrentEventListener {
+
+    private final MessagesToHtmlWriter writer;
+
+    @SuppressWarnings("WeakerAccess") // Used by PluginFactory
+    public HtmlFormatter(OutputStream out) throws IOException {
+        this.writer = new MessagesToHtmlWriter(new OutputStreamWriter(out));
+    }
+
+    @Override
+    public void setEventPublisher(EventPublisher publisher) {
+        publisher.registerHandlerFor(Envelope.class, this::write);
+    }
+
+    private void write(Envelope event) {
+        try {
+            writer.write(event);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+
+        // TODO: Plugins should implement the closable interface
+        // and be closed by Cucumber
+        if (event.hasTestRunFinished()) {
+            try {
+                writer.close();
+            } catch (IOException e) {
+                throw new IllegalStateException(e);
+            }
+        }
+    }
+}
diff --git a/core/src/main/java/io/cucumber/core/plugin/MessageFormatter.java b/core/src/main/java/io/cucumber/core/plugin/MessageFormatter.java
new file mode 100644
index 0000000000..841a8015d1
--- /dev/null
+++ b/core/src/main/java/io/cucumber/core/plugin/MessageFormatter.java
@@ -0,0 +1,42 @@
+package io.cucumber.core.plugin;
+
+import io.cucumber.messages.Messages.Envelope;
+import io.cucumber.messages.internal.com.google.protobuf.util.JsonFormat;
+import io.cucumber.plugin.EventListener;
+import io.cucumber.plugin.event.EventPublisher;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.nio.charset.StandardCharsets;
+
+public final class MessageFormatter implements EventListener {
+    private final Writer writer;
+    private final JsonFormat.Printer jsonPrinter = JsonFormat.printer()
+        .omittingInsignificantWhitespace();
+
+    public MessageFormatter(OutputStream outputStream) {
+        this.writer = new OutputStreamWriter(outputStream, StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public void setEventPublisher(EventPublisher publisher) {
+        publisher.registerHandlerFor(Envelope.class, this::writeMessage);
+    }
+
+    private void writeMessage(Envelope envelope) {
+        try {
+            jsonPrinter.appendTo(envelope, writer);
+            writer.write("\n");
+            writer.flush();
+            if (envelope.hasTestRunFinished()) {
+                writer.close();
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
+
diff --git a/core/src/main/java/io/cucumber/core/plugin/PluginFactory.java b/core/src/main/java/io/cucumber/core/plugin/PluginFactory.java
index 13c7541d89..8df09bdd1b 100644
--- a/core/src/main/java/io/cucumber/core/plugin/PluginFactory.java
+++ b/core/src/main/java/io/cucumber/core/plugin/PluginFactory.java
@@ -5,6 +5,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.io.PrintStream;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -24,7 +25,7 @@
  * @see Plugin for specific requirements
  */
 public final class PluginFactory {
-    private final Class<?>[] CTOR_PARAMETERS = new Class<?>[]{String.class, Appendable.class, URI.class, URL.class, File.class};
+    private final Class<?>[] CTOR_PARAMETERS = new Class<?>[]{String.class, Appendable.class, URI.class, URL.class, File.class, OutputStream.class};
 
     private String defaultOutFormatter = null;
 
@@ -109,6 +110,9 @@ private Object convertOrNull(String arg, Class<?> ctorArgClass, String formatter
         if (ctorArgClass.equals(Appendable.class)) {
             return new UTF8OutputStreamWriter(new URLOutputStream(toURL(arg)));
         }
+        if (ctorArgClass.equals(OutputStream.class)) {
+            return new URLOutputStream(toURL(arg));
+        }
         return null;
     }
 
diff --git a/core/src/main/java/io/cucumber/core/plugin/PrettyFormatter.java b/core/src/main/java/io/cucumber/core/plugin/PrettyFormatter.java
index 4dc43623e4..fa176787a2 100644
--- a/core/src/main/java/io/cucumber/core/plugin/PrettyFormatter.java
+++ b/core/src/main/java/io/cucumber/core/plugin/PrettyFormatter.java
@@ -15,17 +15,19 @@
 import io.cucumber.plugin.event.WriteEvent;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringReader;
 import java.io.StringWriter;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import static io.cucumber.core.plugin.TestSourcesModel.relativize;
 import static java.lang.Math.max;
 import static java.util.Locale.ROOT;
 
@@ -225,4 +227,21 @@ private static String formatStackTrace(Throwable error) {
         return stringWriter.toString();
     }
 
+    static URI relativize(URI uri) {
+        if (!"file".equals(uri.getScheme())) {
+            return uri;
+        }
+        if (!uri.isAbsolute()) {
+            return uri;
+        }
+
+        try {
+            URI root = new File("").toURI();
+            URI relative = root.relativize(uri);
+            // Scheme is lost by relativize
+            return new URI("file", relative.getSchemeSpecificPart(), relative.getFragment());
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException(e.getMessage(), e);
+        }
+    }
 }
diff --git a/core/src/main/java/io/cucumber/core/plugin/RerunFormatter.java b/core/src/main/java/io/cucumber/core/plugin/RerunFormatter.java
index 5b90751d0b..21faed183c 100644
--- a/core/src/main/java/io/cucumber/core/plugin/RerunFormatter.java
+++ b/core/src/main/java/io/cucumber/core/plugin/RerunFormatter.java
@@ -15,7 +15,7 @@
 import java.util.Map;
 
 import static io.cucumber.core.feature.FeatureWithLines.create;
-import static io.cucumber.core.plugin.TestSourcesModel.relativize;
+import static io.cucumber.core.plugin.PrettyFormatter.relativize;
 
 /**
  * Formatter for reporting all failed test cases and print their locations
diff --git a/core/src/main/java/io/cucumber/core/plugin/TimelineFormatter.java b/core/src/main/java/io/cucumber/core/plugin/TimelineFormatter.java
index 9296e3e12d..a3bf05cd0f 100644
--- a/core/src/main/java/io/cucumber/core/plugin/TimelineFormatter.java
+++ b/core/src/main/java/io/cucumber/core/plugin/TimelineFormatter.java
@@ -1,10 +1,10 @@
 package io.cucumber.core.plugin;
 
-import gherkin.deps.com.google.gson.Gson;
-import gherkin.deps.com.google.gson.GsonBuilder;
-import gherkin.deps.com.google.gson.annotations.SerializedName;
 import io.cucumber.core.exception.CucumberException;
 import io.cucumber.core.feature.FeatureParser;
+import io.cucumber.messages.internal.com.google.gson.Gson;
+import io.cucumber.messages.internal.com.google.gson.GsonBuilder;
+import io.cucumber.messages.internal.com.google.gson.annotations.SerializedName;
 import io.cucumber.plugin.ConcurrentEventListener;
 import io.cucumber.plugin.event.EventPublisher;
 import io.cucumber.plugin.event.TestCase;
diff --git a/core/src/main/java/io/cucumber/core/plugin/URLOutputStream.java b/core/src/main/java/io/cucumber/core/plugin/URLOutputStream.java
index dbc95b2e8e..04cf5348b2 100644
--- a/core/src/main/java/io/cucumber/core/plugin/URLOutputStream.java
+++ b/core/src/main/java/io/cucumber/core/plugin/URLOutputStream.java
@@ -1,6 +1,6 @@
 package io.cucumber.core.plugin;
 
-import gherkin.deps.com.google.gson.Gson;
+import io.cucumber.messages.internal.com.google.gson.Gson;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/core/src/main/java/io/cucumber/core/plugin/UsageFormatter.java b/core/src/main/java/io/cucumber/core/plugin/UsageFormatter.java
index 81a53ce86d..55f0c5a05a 100644
--- a/core/src/main/java/io/cucumber/core/plugin/UsageFormatter.java
+++ b/core/src/main/java/io/cucumber/core/plugin/UsageFormatter.java
@@ -1,9 +1,9 @@
 package io.cucumber.core.plugin;
 
-import gherkin.deps.com.google.gson.Gson;
-import gherkin.deps.com.google.gson.GsonBuilder;
-import gherkin.deps.com.google.gson.JsonPrimitive;
-import gherkin.deps.com.google.gson.JsonSerializer;
+import io.cucumber.messages.internal.com.google.gson.Gson;
+import io.cucumber.messages.internal.com.google.gson.GsonBuilder;
+import io.cucumber.messages.internal.com.google.gson.JsonPrimitive;
+import io.cucumber.messages.internal.com.google.gson.JsonSerializer;
 import io.cucumber.plugin.event.EventPublisher;
 import io.cucumber.plugin.event.PickleStepTestStep;
 import io.cucumber.plugin.event.Result;
diff --git a/core/src/main/java/io/cucumber/core/runner/CachingGlue.java b/core/src/main/java/io/cucumber/core/runner/CachingGlue.java
index 9244b3a93a..31d99b8010 100644
--- a/core/src/main/java/io/cucumber/core/runner/CachingGlue.java
+++ b/core/src/main/java/io/cucumber/core/runner/CachingGlue.java
@@ -11,12 +11,15 @@
 import io.cucumber.core.backend.ScenarioScoped;
 import io.cucumber.core.backend.StepDefinition;
 import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.core.exception.CucumberException;
 import io.cucumber.core.gherkin.Step;
 import io.cucumber.core.stepexpression.Argument;
 import io.cucumber.core.stepexpression.StepTypeRegistry;
 import io.cucumber.cucumberexpressions.ParameterByTypeTransformer;
+import io.cucumber.cucumberexpressions.UndefinedParameterTypeException;
 import io.cucumber.datatable.TableCellByTypeTransformer;
 import io.cucumber.datatable.TableEntryByTypeTransformer;
+import io.cucumber.messages.Messages;
 import io.cucumber.plugin.event.StepDefinedEvent;
 
 import java.net.URI;
@@ -211,23 +214,67 @@ void prepareGlue(StepTypeRegistry stepTypeRegistry) throws DuplicateStepDefiniti
             throw new DuplicateDefaultDataTableCellTransformers(defaultDataTableCellTransformers);
         }
 
+        // TODO: Redefine hooks for each scenario, similar to how we're doing for CoreStepDefinition
+        beforeHooks.forEach(this::emitHook);
+
         stepDefinitions.forEach(stepDefinition -> {
-            CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+            CoreStepDefinition coreStepDefinition = new CoreStepDefinition(bus.generateId(), stepDefinition, stepTypeRegistry);
             CoreStepDefinition previous = stepDefinitionsByPattern.get(stepDefinition.getPattern());
             if (previous != null) {
                 throw new DuplicateStepDefinitionException(previous.getStepDefinition(), stepDefinition);
             }
             stepDefinitionsByPattern.put(coreStepDefinition.getPattern(), coreStepDefinition);
-            bus.send(
-                new StepDefinedEvent(
-                    bus.getInstant(),
-                    new io.cucumber.plugin.event.StepDefinition(
-                        stepDefinition.getLocation(),
-                        stepDefinition.getPattern()
-                    )
-                )
-            );
+            emitStepDefined(coreStepDefinition);
         });
+
+        afterHooks.forEach(this::emitHook);
+    }
+
+    private CucumberException registerTypeInConfiguration(String expressionString, UndefinedParameterTypeException e) {
+        return new CucumberException(String.format("" +
+                "Could not create a cucumber expression for '%s'.\n" +
+                "It appears you did not register parameter type. The details are in the stacktrace below.\n" +
+                "You can find the documentation here: https://docs.cucumber.io/cucumber/cucumber-expressions/",
+            expressionString
+        ), e);
+    }
+
+    private void emitHook(CoreHookDefinition hook) {
+        bus.send(Messages.Envelope.newBuilder()
+            .setHook(Messages.Hook.newBuilder()
+                .setId(hook.getId().toString())
+                .setTagExpression(hook.getTagExpression())
+                .setSourceReference(Messages.SourceReference.newBuilder()
+                    // TODO: Maybe we should add a proper URI prefix here, like "javamethod:....". Maybe there is
+                    // a standard for this
+                    .setUri(hook.getLocation()))
+            )
+            .build()
+        );
+    }
+
+    private void emitStepDefined(CoreStepDefinition stepDefinition) {
+        bus.send(new StepDefinedEvent(
+                bus.getInstant(),
+                new io.cucumber.plugin.event.StepDefinition(
+                    stepDefinition.getStepDefinition().getLocation(),
+                    stepDefinition.getPattern()
+                )
+            )
+        );
+        bus.send(Messages.Envelope.newBuilder()
+            .setStepDefinition(
+                Messages.StepDefinition.newBuilder()
+                    .setId(stepDefinition.getId().toString())
+                    .setPattern(Messages.StepDefinitionPattern.newBuilder()
+                        .setSource(stepDefinition.getPattern())
+                        .build())
+                    .setSourceReference(Messages.SourceReference.newBuilder()
+                        .setUri(stepDefinition.getStepDefinition().getLocation())
+                        .build())
+                    .build())
+            .build()
+        );
     }
 
     PickleStepDefinitionMatch stepDefinitionMatch(URI uri, Step step) throws AmbiguousStepDefinitionsException {
diff --git a/core/src/main/java/io/cucumber/core/runner/CoreHookDefinition.java b/core/src/main/java/io/cucumber/core/runner/CoreHookDefinition.java
index b7b74e913e..843bed1f9c 100644
--- a/core/src/main/java/io/cucumber/core/runner/CoreHookDefinition.java
+++ b/core/src/main/java/io/cucumber/core/runner/CoreHookDefinition.java
@@ -7,6 +7,9 @@
 import io.cucumber.tagexpressions.TagExpressionParser;
 
 import java.util.List;
+import java.util.UUID;
+
+import static java.util.Objects.requireNonNull;
 
 class CoreHookDefinition {
 
@@ -16,13 +19,15 @@ static CoreHookDefinition create(HookDefinition hookDefinition) {
         if (hookDefinition instanceof ScenarioScoped) {
             return new ScenarioScopedCoreHookDefinition(hookDefinition);
         }
-        return new CoreHookDefinition(hookDefinition);
+        return new CoreHookDefinition(UUID.randomUUID(), hookDefinition);
     }
 
+    private final UUID id;
     private final HookDefinition delegate;
     private final Expression tagExpression;
 
-    private CoreHookDefinition(HookDefinition delegate) {
+    private CoreHookDefinition(UUID id, HookDefinition delegate) {
+        this.id = requireNonNull(id);
         this.delegate = delegate;
         this.tagExpression = new TagExpressionParser().parse(delegate.getTagExpression());
     }
@@ -39,6 +44,10 @@ String getLocation() {
         return delegate.getLocation();
     }
 
+    UUID getId() {
+        return id;
+    }
+
     int getOrder() {
         return delegate.getOrder();
     }
@@ -47,9 +56,13 @@ boolean matches(List<String> tags) {
         return tagExpression.evaluate(tags);
     }
 
+    String getTagExpression() {
+        return delegate.getTagExpression();
+    }
+
     static class ScenarioScopedCoreHookDefinition extends CoreHookDefinition implements ScenarioScoped {
         private ScenarioScopedCoreHookDefinition(HookDefinition delegate) {
-            super(delegate);
+            super(UUID.randomUUID(), delegate);
         }
 
     }
diff --git a/core/src/main/java/io/cucumber/core/runner/CoreStepDefinition.java b/core/src/main/java/io/cucumber/core/runner/CoreStepDefinition.java
index 5c8653ebf2..e4ae2a8778 100644
--- a/core/src/main/java/io/cucumber/core/runner/CoreStepDefinition.java
+++ b/core/src/main/java/io/cucumber/core/runner/CoreStepDefinition.java
@@ -11,18 +11,21 @@
 
 import java.lang.reflect.Type;
 import java.util.List;
+import java.util.UUID;
 import java.util.function.Supplier;
 
 import static java.util.Objects.requireNonNull;
 
 final class CoreStepDefinition {
 
+    private final UUID id;
     private final StepExpression expression;
     private final ArgumentMatcher argumentMatcher;
     private final StepDefinition stepDefinition;
     private final Type[] types;
 
-    CoreStepDefinition(StepDefinition stepDefinition, StepTypeRegistry stepTypeRegistry) {
+    CoreStepDefinition(UUID id, StepDefinition stepDefinition, StepTypeRegistry stepTypeRegistry) {
+        this.id = requireNonNull(id);
         this.stepDefinition = requireNonNull(stepDefinition);
         List<ParameterInfo> parameterInfos = stepDefinition.parameterInfos();
         this.expression = createExpression(parameterInfos, stepDefinition.getPattern(), stepTypeRegistry);
@@ -41,11 +44,11 @@ private StepExpression createExpression(List<ParameterInfo> parameterInfos, Stri
         }
     }
 
-    public String getPattern() {
+    String getPattern() {
         return expression.getSource();
     }
 
-    public StepDefinition getStepDefinition() {
+    StepDefinition getStepDefinition() {
         return stepDefinition;
     }
 
@@ -53,6 +56,10 @@ List<Argument> matchedArguments(Step step) {
         return argumentMatcher.argumentsFrom(step, types);
     }
 
+    UUID getId() {
+        return id;
+    }
+
     private static Type[] getTypes(List<ParameterInfo> parameterInfos) {
         if (parameterInfos == null) {
             return new Type[0];
diff --git a/core/src/main/java/io/cucumber/core/runner/DefinitionArgument.java b/core/src/main/java/io/cucumber/core/runner/DefinitionArgument.java
index 6631782c8e..e12db6033c 100644
--- a/core/src/main/java/io/cucumber/core/runner/DefinitionArgument.java
+++ b/core/src/main/java/io/cucumber/core/runner/DefinitionArgument.java
@@ -4,13 +4,17 @@
 import io.cucumber.plugin.event.Argument;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.stream.Collectors;
 
 final class DefinitionArgument implements Argument {
 
+    private final ExpressionArgument argument;
     private final io.cucumber.cucumberexpressions.Group group;
 
     private DefinitionArgument(ExpressionArgument argument) {
+        this.argument = argument;
         this.group = argument.getGroup();
     }
 
@@ -25,6 +29,11 @@ static List<Argument> createArguments(List<io.cucumber.core.stepexpression.Argum
         return args;
     }
 
+    @Override
+    public String getParameterTypeName() {
+        return argument.getParameterTypeName();
+    }
+
     @Override
     public String getValue() {
         return group == null ? null : group.getValue();
@@ -39,4 +48,42 @@ public int getStart() {
     public int getEnd() {
         return group == null ? -1 : group.getEnd();
     }
+
+    @Override
+    public io.cucumber.plugin.event.Group getGroup() {
+        return group == null ? null : new Group(group);
+    }
+
+    private static final class Group implements io.cucumber.plugin.event.Group {
+
+        private final io.cucumber.cucumberexpressions.Group group;
+        private final List<io.cucumber.plugin.event.Group> children;
+
+        private Group(io.cucumber.cucumberexpressions.Group group) {
+            this.group = group;
+            children = group.getChildren().stream()
+                .map(Group::new)
+                .collect(Collectors.toList());
+        }
+
+        @Override
+        public Collection<io.cucumber.plugin.event.Group> getChildren() {
+            return children;
+        }
+
+        @Override
+        public String getValue() {
+            return group.getValue();
+        }
+
+        @Override
+        public int getStart() {
+            return group.getStart();
+        }
+
+        @Override
+        public int getEnd() {
+            return group.getEnd();
+        }
+    }
 }
diff --git a/core/src/main/java/io/cucumber/core/runner/HookDefinitionMatch.java b/core/src/main/java/io/cucumber/core/runner/HookDefinitionMatch.java
index 262b4ea41a..79ad3f784d 100644
--- a/core/src/main/java/io/cucumber/core/runner/HookDefinitionMatch.java
+++ b/core/src/main/java/io/cucumber/core/runner/HookDefinitionMatch.java
@@ -4,8 +4,10 @@
 import io.cucumber.core.backend.CucumberInvocationTargetException;
 import io.cucumber.core.backend.TestCaseState;
 import io.cucumber.core.exception.CucumberException;
+import io.cucumber.messages.Messages;
 
 import static io.cucumber.core.runner.StackManipulation.removeFrameworkFrames;
+import static java.util.Collections.emptyList;
 
 final class HookDefinitionMatch implements StepDefinitionMatch {
     private final CoreHookDefinition hookDefinition;
diff --git a/core/src/main/java/io/cucumber/core/runner/PickleStepTestStep.java b/core/src/main/java/io/cucumber/core/runner/PickleStepTestStep.java
index 7c98dc3837..a2f0310f3e 100644
--- a/core/src/main/java/io/cucumber/core/runner/PickleStepTestStep.java
+++ b/core/src/main/java/io/cucumber/core/runner/PickleStepTestStep.java
@@ -36,17 +36,17 @@ final class PickleStepTestStep extends TestStep implements io.cucumber.plugin.ev
     }
 
     @Override
-    boolean run(TestCase testCase, EventBus bus, TestCaseState state, boolean skipSteps, UUID testExecutionId) {
+    boolean run(TestCase testCase, EventBus bus, TestCaseState state, boolean skipSteps) {
         boolean skipNextStep = skipSteps;
 
         for (HookTestStep before : beforeStepHookSteps) {
-            skipNextStep |= before.run(testCase, bus, state, skipSteps, testExecutionId);
+            skipNextStep |= before.run(testCase, bus, state, skipSteps);
         }
 
-        skipNextStep |= super.run(testCase, bus, state, skipNextStep, testExecutionId);
+        skipNextStep |= super.run(testCase, bus, state, skipNextStep);
 
         for (HookTestStep after : afterStepHookSteps) {
-            skipNextStep |= after.run(testCase, bus, state, skipSteps, testExecutionId);
+            skipNextStep |= after.run(testCase, bus, state, skipSteps);
         }
 
         return skipNextStep;
diff --git a/core/src/main/java/io/cucumber/core/runner/TestCase.java b/core/src/main/java/io/cucumber/core/runner/TestCase.java
index 5345dd448b..7ac3b7a34d 100644
--- a/core/src/main/java/io/cucumber/core/runner/TestCase.java
+++ b/core/src/main/java/io/cucumber/core/runner/TestCase.java
@@ -2,12 +2,19 @@
 
 import io.cucumber.core.eventbus.EventBus;
 import io.cucumber.core.gherkin.Pickle;
+import io.cucumber.messages.Messages;
+import io.cucumber.messages.Messages.Envelope;
+import io.cucumber.messages.Messages.StepMatchArgument;
+import io.cucumber.messages.Messages.TestCase.TestStep.StepMatchArgumentsList;
+import io.cucumber.plugin.event.Group;
 import io.cucumber.plugin.event.Result;
 import io.cucumber.plugin.event.Status;
 import io.cucumber.plugin.event.TestCaseFinished;
 import io.cucumber.plugin.event.TestCaseStarted;
 import io.cucumber.plugin.event.TestStep;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.net.URI;
 import java.time.Duration;
 import java.time.Instant;
@@ -15,6 +22,12 @@
 import java.util.List;
 import java.util.UUID;
 
+import static io.cucumber.core.runner.TestStepResultStatus.from;
+import static io.cucumber.messages.TimeConversion.javaDurationToDuration;
+import static io.cucumber.messages.TimeConversion.javaInstantToTimestamp;
+import static java.util.Collections.singletonList;
+import static java.util.stream.Collectors.toList;
+
 final class TestCase implements io.cucumber.plugin.event.TestCase {
     private final Pickle pickle;
     private final List<PickleStepTestStep> testSteps;
@@ -38,28 +51,31 @@ final class TestCase implements io.cucumber.plugin.event.TestCase {
 
     void run(EventBus bus) {
         boolean skipNextStep = this.dryRun;
+        emitTestCaseMessage(bus);
+
         Instant start = bus.getInstant();
         UUID executionId = bus.generateId();
-        bus.send(new TestCaseStarted(start, this));
-        TestCaseState state = new TestCaseState(bus, this);
+        emitTestCaseStarted(bus, start, executionId);
+
+        TestCaseState state = new TestCaseState(bus, executionId, this);
 
         for (HookTestStep before : beforeHooks) {
-            skipNextStep |= before.run(this, bus, state, dryRun, executionId);
+            skipNextStep |= before.run(this, bus, state, dryRun);
         }
 
         for (PickleStepTestStep step : testSteps) {
-            skipNextStep |= step.run(this, bus, state, skipNextStep, executionId);
+            skipNextStep |= step.run(this, bus, state, skipNextStep);
         }
 
         for (HookTestStep after : afterHooks) {
-            after.run(this, bus, state, dryRun, executionId);
+            after.run(this, bus, state, dryRun);
         }
 
         Instant stop = bus.getInstant();
         Duration duration = Duration.between(start, stop);
         Status status = Status.valueOf(state.getStatus().name());
         Result result = new Result(status, duration, state.getError());
-        bus.send(new TestCaseFinished(stop, this, result));
+        emitTestCaseFinished(bus, executionId, stop, duration, status, result);
     }
 
     @Override
@@ -113,4 +129,97 @@ public List<String> getTags() {
         return pickle.getTags();
     }
 
+    private void emitTestCaseMessage(EventBus bus) {
+        bus.send(Envelope.newBuilder()
+            .setTestCase(Messages.TestCase.newBuilder()
+                .setId(id.toString())
+                .setPickleId(pickle.getId())
+                .addAllTestSteps(getTestSteps()
+                    .stream()
+                    .map(this::createTestStep)
+                    .collect(toList())
+                )
+            ).build()
+        );
+    }
+
+    private Messages.TestCase.TestStep createTestStep(TestStep testStep) {
+        Messages.TestCase.TestStep.Builder testStepBuilder = Messages.TestCase.TestStep
+            .newBuilder()
+            .setId(testStep.getId().toString());
+
+        if (testStep instanceof HookTestStep) {
+            HookTestStep hookTestStep = (HookTestStep) testStep;
+            testStepBuilder.setHookId(hookTestStep.getId().toString());
+        } else if (testStep instanceof PickleStepTestStep) {
+            PickleStepTestStep pickleStep = (PickleStepTestStep) testStep;
+            testStepBuilder
+                .addAllStepDefinitionIds(singletonList(pickleStep.getId().toString()))
+                .setPickleStepId(pickleStep.getStep().getId())
+                .addAllStepMatchArgumentsLists(getStepMatchArguments(pickleStep));
+        }
+
+        return testStepBuilder.build();
+    }
+
+    public Iterable<StepMatchArgumentsList> getStepMatchArguments(PickleStepTestStep pickleStep) {
+        return pickleStep.getDefinitionArgument().stream()
+            .map(arg -> StepMatchArgumentsList.newBuilder()
+                .addStepMatchArguments(StepMatchArgument.newBuilder()
+                    .setParameterTypeName(arg.getParameterTypeName())
+                    .setGroup(makeMessageGroup(arg.getGroup()))
+                    .build())
+                .build()
+            ).collect(toList());
+    }
+
+    private static StepMatchArgument.Group makeMessageGroup(Group group) {
+        StepMatchArgument.Group.Builder builder = StepMatchArgument.Group.newBuilder();
+        if (group == null) {
+            return builder.build();
+        }
+
+        if (group.getValue() != null) {
+            builder.setValue(group.getValue());
+        }
+        return builder
+            //TODO: We can't represent undefined / missing matches.
+            .setStart(group.getStart())
+            .addAllChildren(group.getChildren().stream()
+                .map(TestCase::makeMessageGroup)
+                .collect(toList()))
+            .build();
+    }
+
+    private void emitTestCaseStarted(EventBus bus, Instant start, UUID executionId) {
+        bus.send(new TestCaseStarted(start, this));
+        bus.send(Envelope.newBuilder()
+            .setTestCaseStarted(Messages.TestCaseStarted.newBuilder()
+                .setId(executionId.toString())
+                .setTestCaseId(id.toString())
+                .setTimestamp(javaInstantToTimestamp(start))).build());
+    }
+
+    private void emitTestCaseFinished(EventBus bus, UUID executionId, Instant stop, Duration duration, Status status, Result result) {
+        bus.send(new TestCaseFinished(stop, this, result));
+        Messages.TestStepResult.Builder testResultBuilder = Messages.TestStepResult.newBuilder()
+            .setStatus(from(status))
+            .setDuration(javaDurationToDuration(duration));
+
+        if (result.getError() != null) {
+            testResultBuilder.setMessage(toString(result.getError()));
+        }
+
+        bus.send(Envelope.newBuilder()
+            .setTestCaseFinished(Messages.TestCaseFinished.newBuilder()
+                .setTestCaseStartedId(executionId.toString())
+                .setTimestamp(javaInstantToTimestamp(stop)))
+            .build());
+    }
+
+    private static String toString(Throwable error) {
+        StringWriter stringWriter = new StringWriter();
+        error.printStackTrace(new PrintWriter(stringWriter));
+        return stringWriter.toString();
+    }
 }
diff --git a/core/src/main/java/io/cucumber/core/runner/TestCaseState.java b/core/src/main/java/io/cucumber/core/runner/TestCaseState.java
index 1c4a9086ea..ef70cab440 100644
--- a/core/src/main/java/io/cucumber/core/runner/TestCaseState.java
+++ b/core/src/main/java/io/cucumber/core/runner/TestCaseState.java
@@ -2,6 +2,8 @@
 
 import io.cucumber.core.backend.Status;
 import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.messages.Messages;
+import io.cucumber.messages.internal.com.google.protobuf.ByteString;
 import io.cucumber.plugin.event.EmbedEvent;
 import io.cucumber.plugin.event.Result;
 import io.cucumber.plugin.event.TestCase;
@@ -11,6 +13,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.UUID;
 
 import static java.util.Collections.max;
 import static java.util.Comparator.comparing;
@@ -21,9 +24,13 @@ class TestCaseState implements io.cucumber.core.backend.TestCaseState {
     private final List<Result> stepResults = new ArrayList<>();
     private final EventBus bus;
     private final TestCase testCase;
+    private final UUID testExecutionId;
 
-    TestCaseState(EventBus bus, TestCase testCase) {
+    private UUID currentTestStepId;
+
+    TestCaseState(EventBus bus, UUID testExecutionId, TestCase testCase) {
         this.bus = requireNonNull(bus);
+        this.testExecutionId = requireNonNull(testExecutionId);
         this.testCase = requireNonNull(testCase);
     }
 
@@ -31,6 +38,10 @@ void add(Result result) {
         stepResults.add(result);
     }
 
+    UUID getTestExecutionId() {
+        return testExecutionId;
+    }
+
     @Override
     public Collection<String> getSourceTagNames() {
         return testCase.getTags();
@@ -54,17 +65,40 @@ public boolean isFailed() {
     @Deprecated
     @Override
     public void embed(byte[] data, String mediaType) {
-        bus.send(new EmbedEvent(bus.getInstant(), testCase, data, mediaType));
+        embed(data, mediaType, null);
     }
 
     @Override
     public void embed(byte[] data, String mediaType, String name) {
         bus.send(new EmbedEvent(bus.getInstant(), testCase, data, mediaType, name));
+        bus.send(Messages.Envelope.newBuilder()
+            .setAttachment(
+                Messages.Attachment.newBuilder()
+                    .setTestCaseStartedId(testExecutionId.toString())
+                    .setTestStepId(currentTestStepId.toString())
+                    .setBinary(ByteString.copyFrom(data))
+                     //TODO: Add file name to message protocol
+                    .setMediaType(mediaType)
+                    .build()
+            )
+            .build()
+        );
     }
 
     @Override
     public void write(String text) {
         bus.send(new WriteEvent(bus.getInstant(), testCase, text));
+        bus.send(Messages.Envelope.newBuilder()
+            .setAttachment(
+                Messages.Attachment.newBuilder()
+                    .setTestCaseStartedId(testExecutionId.toString())
+                    .setTestStepId(currentTestStepId.toString())
+                    .setText(text)
+                    .setMediaType("text/plain")
+                    .build()
+            )
+            .build()
+        );
     }
 
     @Override
@@ -94,4 +128,13 @@ Throwable getError() {
 
         return max(stepResults, comparing(Result::getStatus)).getError();
     }
+
+    void setCurrentTestStepId(UUID currentTestStepId) {
+        this.currentTestStepId = currentTestStepId;
+    }
+
+    void clearCurrentTestStepId() {
+        this.currentTestStepId = null;
+    }
+
 }
diff --git a/core/src/main/java/io/cucumber/core/runner/TestStep.java b/core/src/main/java/io/cucumber/core/runner/TestStep.java
index 63cbe0ae13..e4fd50d8dc 100644
--- a/core/src/main/java/io/cucumber/core/runner/TestStep.java
+++ b/core/src/main/java/io/cucumber/core/runner/TestStep.java
@@ -2,17 +2,25 @@
 
 import io.cucumber.core.backend.Pending;
 import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.messages.Messages;
+import io.cucumber.messages.Messages.TestStepResult;
 import io.cucumber.plugin.event.Result;
 import io.cucumber.plugin.event.Status;
 import io.cucumber.plugin.event.TestCase;
 import io.cucumber.plugin.event.TestStepFinished;
 import io.cucumber.plugin.event.TestStepStarted;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.Instant;
 import java.util.Arrays;
 import java.util.UUID;
 
+import static io.cucumber.core.runner.TestStepResultStatus.from;
+import static io.cucumber.messages.TimeConversion.javaDurationToDuration;
+import static io.cucumber.messages.TimeConversion.javaInstantToTimestamp;
 import static java.time.Duration.ZERO;
 
 abstract class TestStep implements io.cucumber.plugin.event.TestStep {
@@ -35,14 +43,20 @@ abstract class TestStep implements io.cucumber.plugin.event.TestStep {
         this.stepDefinitionMatch = stepDefinitionMatch;
     }
 
+    @Override
+    public UUID getId() {
+        return id;
+    }
+
     @Override
     public String getCodeLocation() {
         return stepDefinitionMatch.getCodeLocation();
     }
 
-    boolean run(TestCase testCase, EventBus bus, TestCaseState state, boolean skipSteps, UUID textExecutionId) {
+    boolean run(TestCase testCase, EventBus bus, TestCaseState state, boolean skipSteps) {
         Instant startTime = bus.getInstant();
-        bus.send(new TestStepStarted(startTime, testCase, this));
+        emitTestStepStarted(testCase, bus, state.getTestExecutionId(), startTime);
+
         Status status;
         Throwable error = null;
         try {
@@ -55,17 +69,62 @@ boolean run(TestCase testCase, EventBus bus, TestCaseState state, boolean skipSt
         Duration duration = Duration.between(startTime, stopTime);
         Result result = mapStatusToResult(status, error, duration);
         state.add(result);
-        bus.send(new TestStepFinished(stopTime, testCase, this, result));
+
+        emitTestStepFinished(testCase, bus, state.getTestExecutionId(), stopTime, duration, result);
+
         return !result.getStatus().is(Status.PASSED);
     }
 
+
+    private void emitTestStepStarted(TestCase testCase, EventBus bus, UUID textExecutionId, Instant startTime) {
+        bus.send(new TestStepStarted(startTime, testCase, this));
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestStepStarted(Messages.TestStepStarted.newBuilder()
+                .setTestCaseStartedId(textExecutionId.toString())
+                .setTestStepId(id.toString())
+                .setTimestamp(javaInstantToTimestamp(startTime))
+            ).build()
+        );
+    }
+
+    private void emitTestStepFinished(TestCase testCase, EventBus bus, UUID textExecutionId, Instant stopTime, Duration duration, Result result) {
+        bus.send(new TestStepFinished(stopTime, testCase, this, result));
+        TestStepResult.Builder builder = TestStepResult.newBuilder();
+
+        if (result.getError() != null) {
+            builder.setMessage(extractStackTrace(result.getError()));
+        }
+        TestStepResult testResult = builder.setStatus(from(result.getStatus()))
+            .setDuration(javaDurationToDuration(duration))
+            .build();
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestStepFinished(Messages.TestStepFinished.newBuilder()
+                .setTestCaseStartedId(textExecutionId.toString())
+                .setTestStepId(id.toString())
+                .setTimestamp(javaInstantToTimestamp(stopTime))
+                .setTestStepResult(testResult)
+            ).build()
+        );
+    }
+    private String extractStackTrace(Throwable error) {
+        ByteArrayOutputStream s = new ByteArrayOutputStream();
+        PrintStream printStream = new PrintStream(s);
+        error.printStackTrace(printStream);
+        return new String(s.toByteArray(), StandardCharsets.UTF_8);
+    }
+
     private Status executeStep(TestCaseState state, boolean skipSteps) throws Throwable {
-        if (!skipSteps) {
-            stepDefinitionMatch.runStep(state);
-            return Status.PASSED;
-        } else {
-            stepDefinitionMatch.dryRunStep(state);
-            return Status.SKIPPED;
+        state.setCurrentTestStepId(id);
+        try {
+            if (!skipSteps) {
+                stepDefinitionMatch.runStep(state);
+                return Status.PASSED;
+            } else {
+                stepDefinitionMatch.dryRunStep(state);
+                return Status.SKIPPED;
+            }
+        } finally {
+            state.clearCurrentTestStepId();
         }
     }
 
diff --git a/core/src/main/java/io/cucumber/core/runner/TestStepResultStatus.java b/core/src/main/java/io/cucumber/core/runner/TestStepResultStatus.java
new file mode 100644
index 0000000000..71fca67098
--- /dev/null
+++ b/core/src/main/java/io/cucumber/core/runner/TestStepResultStatus.java
@@ -0,0 +1,26 @@
+package io.cucumber.core.runner;
+
+import io.cucumber.messages.Messages;
+import io.cucumber.plugin.event.Status;
+
+import java.util.HashMap;
+import java.util.Map;
+
+class TestStepResultStatus {
+    private static final Map<Status, Messages.TestStepResult.Status> STATUS = new HashMap<Status, Messages.TestStepResult.Status>() {{
+        put(Status.FAILED, Messages.TestStepResult.Status.FAILED);
+        put(Status.PASSED, Messages.TestStepResult.Status.PASSED);
+        put(Status.UNDEFINED, Messages.TestStepResult.Status.UNDEFINED);
+        put(Status.PENDING, Messages.TestStepResult.Status.PENDING);
+        put(Status.SKIPPED, Messages.TestStepResult.Status.SKIPPED);
+        put(Status.AMBIGUOUS, Messages.TestStepResult.Status.AMBIGUOUS);
+    }};
+
+    private TestStepResultStatus() {
+    }
+
+    static Messages.TestStepResult.Status from(Status status) {
+        return STATUS.getOrDefault(status, Messages.TestStepResult.Status.UNKNOWN);
+    }
+
+}
diff --git a/core/src/main/java/io/cucumber/core/runtime/Runtime.java b/core/src/main/java/io/cucumber/core/runtime/Runtime.java
index 4c3266d6eb..68fbafe39b 100644
--- a/core/src/main/java/io/cucumber/core/runtime/Runtime.java
+++ b/core/src/main/java/io/cucumber/core/runtime/Runtime.java
@@ -14,6 +14,7 @@
 import io.cucumber.core.plugin.PluginFactory;
 import io.cucumber.core.plugin.Plugins;
 import io.cucumber.core.resource.ClassLoaders;
+import io.cucumber.messages.Messages;
 import io.cucumber.plugin.ConcurrentEventListener;
 import io.cucumber.plugin.Plugin;
 import io.cucumber.plugin.event.EventHandler;
@@ -26,6 +27,7 @@
 import io.cucumber.plugin.event.TestSourceRead;
 
 import java.time.Clock;
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -42,6 +44,7 @@
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import static io.cucumber.messages.TimeConversion.javaInstantToTimestamp;
 import static java.util.Collections.emptyList;
 import static java.util.Collections.max;
 import static java.util.Collections.min;
@@ -86,9 +89,9 @@ private Runtime(final ExitStatus exitStatus,
 
     public void run() {
         final List<Feature> features = featureSupplier.get();
-        bus.send(new TestRunStarted(bus.getInstant()));
+        emitTestRunStarted();
         for (Feature feature : features) {
-            bus.send(new TestSourceRead(bus.getInstant(), feature.getUri(), feature.getSource()));
+            emitTestSource(feature);
         }
 
         final List<Future<?>> executingPickles = features.stream()
@@ -120,7 +123,30 @@ public void run() {
             throw new CompositeCucumberException(thrown);
         }
 
-        bus.send(new TestRunFinished(bus.getInstant()));
+        emitTestRunFinished();
+    }
+
+    private void emitTestRunStarted() {
+        Instant instant = bus.getInstant();
+        bus.send(new TestRunStarted(instant));
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestRunStarted(Messages.TestRunStarted.newBuilder()
+                .setTimestamp(javaInstantToTimestamp(instant)))
+            .build());
+    }
+
+    private void emitTestSource(Feature feature) {
+        bus.send(new TestSourceRead(bus.getInstant(), feature.getUri(), feature.getSource()));
+        bus.sendAll(feature.getParseEvents());
+    }
+
+    private void emitTestRunFinished() {
+        Instant instant = bus.getInstant();
+        bus.send(new TestRunFinished(instant));
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestRunFinished(Messages.TestRunFinished.newBuilder()
+                .setTimestamp(javaInstantToTimestamp(instant)))
+            .build());
     }
 
     public byte exitStatus() {
diff --git a/core/src/main/java/io/cucumber/core/runtime/ThreadLocalRunnerSupplier.java b/core/src/main/java/io/cucumber/core/runtime/ThreadLocalRunnerSupplier.java
index ceef89d1a4..a6500fed3d 100644
--- a/core/src/main/java/io/cucumber/core/runtime/ThreadLocalRunnerSupplier.java
+++ b/core/src/main/java/io/cucumber/core/runtime/ThreadLocalRunnerSupplier.java
@@ -1,6 +1,5 @@
 package io.cucumber.core.runtime;
 
-import io.cucumber.plugin.event.Event;
 import io.cucumber.plugin.event.EventHandler;
 import io.cucumber.core.eventbus.AbstractEventBus;
 import io.cucumber.core.eventbus.EventBus;
@@ -63,7 +62,7 @@ private static final class LocalEventBus extends AbstractEventBus {
         }
 
         @Override
-        public void send(final Event event) {
+        public <T> void send(final T event) {
             super.send(event);
             parent.send(event);
         }
@@ -96,22 +95,22 @@ private SynchronizedEventBus(final EventBus delegate) {
         }
 
         @Override
-        public synchronized void send(final Event event) {
+        public synchronized <T> void send(final T event) {
             delegate.send(event);
         }
 
         @Override
-        public synchronized void sendAll(final Iterable<Event> events) {
+        public synchronized <T> void sendAll(final Iterable<T> events) {
             delegate.sendAll(events);
         }
 
         @Override
-        public synchronized <T extends Event> void registerHandlerFor(Class<T> eventType, EventHandler<T> handler) {
+        public synchronized <T> void registerHandlerFor(Class<T> eventType, EventHandler<T> handler) {
             delegate.registerHandlerFor(eventType, handler);
         }
 
         @Override
-        public synchronized <T extends Event> void removeHandlerFor(Class<T> eventType, EventHandler<T> handler) {
+        public synchronized <T> void removeHandlerFor(Class<T> eventType, EventHandler<T> handler) {
             delegate.removeHandlerFor(eventType, handler);
         }
 
diff --git a/core/src/main/java/io/cucumber/core/stepexpression/ArgumentMatcher.java b/core/src/main/java/io/cucumber/core/stepexpression/ArgumentMatcher.java
index bf60d1c2ea..a9fc7bc640 100644
--- a/core/src/main/java/io/cucumber/core/stepexpression/ArgumentMatcher.java
+++ b/core/src/main/java/io/cucumber/core/stepexpression/ArgumentMatcher.java
@@ -33,7 +33,7 @@ public List<Argument> argumentsFrom(Step step, Type... types) {
         if (arg instanceof io.cucumber.core.gherkin.DocStringArgument) {
             DocStringArgument docString = (DocStringArgument) arg;
             String content = docString.getContent();
-            String contentType = docString.getContentType();
+            String contentType = docString.getMediaType();
             return expression.match(step.getText(), content, contentType, types);
         }
 
diff --git a/core/src/main/java/io/cucumber/core/stepexpression/ExpressionArgument.java b/core/src/main/java/io/cucumber/core/stepexpression/ExpressionArgument.java
index 5ec5e8c355..d73292339b 100644
--- a/core/src/main/java/io/cucumber/core/stepexpression/ExpressionArgument.java
+++ b/core/src/main/java/io/cucumber/core/stepexpression/ExpressionArgument.java
@@ -2,6 +2,8 @@
 
 import io.cucumber.cucumberexpressions.Group;
 
+import java.lang.reflect.Type;
+
 public final class ExpressionArgument implements Argument {
 
     private final io.cucumber.cucumberexpressions.Argument<?> argument;
@@ -19,6 +21,14 @@ public Group getGroup() {
         return argument.getGroup();
     }
 
+    public Type getType() {
+        return argument.getType();
+    }
+
+    public String getParameterTypeName() {
+        return argument.getParameterType().getName();
+    }
+
     @Override
     public String toString() {
         return argument.getGroup() == null ? null : argument.getGroup().getValue();
diff --git a/core/src/main/java/io/cucumber/core/stepexpression/StepExpression.java b/core/src/main/java/io/cucumber/core/stepexpression/StepExpression.java
index 1be7421b02..6a9618d97f 100644
--- a/core/src/main/java/io/cucumber/core/stepexpression/StepExpression.java
+++ b/core/src/main/java/io/cucumber/core/stepexpression/StepExpression.java
@@ -54,7 +54,6 @@ public List<Argument> match(String text, String content, String contentType, Typ
         return list;
     }
 
-
     private static List<Argument> wrapPlusOne(List<io.cucumber.cucumberexpressions.Argument<?>> match) {
         List<Argument> copy = new ArrayList<>(match.size() + 1);
         for (io.cucumber.cucumberexpressions.Argument<?> argument : match) {
@@ -62,5 +61,4 @@ private static List<Argument> wrapPlusOne(List<io.cucumber.cucumberexpressions.A
         }
         return copy;
     }
-
 }
diff --git a/core/src/main/resources/io/cucumber/core/plugin/html/bubble_256x256.png b/core/src/main/resources/io/cucumber/core/plugin/html/bubble_256x256.png
deleted file mode 100644
index b28d9f2f53..0000000000
Binary files a/core/src/main/resources/io/cucumber/core/plugin/html/bubble_256x256.png and /dev/null differ
diff --git a/core/src/main/resources/io/cucumber/core/plugin/html/formatter.js b/core/src/main/resources/io/cucumber/core/plugin/html/formatter.js
deleted file mode 100644
index d8eac90388..0000000000
--- a/core/src/main/resources/io/cucumber/core/plugin/html/formatter.js
+++ /dev/null
@@ -1,257 +0,0 @@
-var CucumberHTML = {};
-
-CucumberHTML.DOMFormatter = function(rootNode) {
-  var currentUri;
-  var currentFeature;
-  var currentElement;
-  var currentSteps;
-
-  var currentStepIndex;
-  var currentStep;
-  var $templates = $(CucumberHTML.templates);
-
-  this.uri = function(uri) {
-    currentUri = uri;
-  };
-
-  this.feature = function(feature) {
-    currentFeature = blockElement(rootNode, feature, 'feature');
-  };
-
-  this.background = function(background) {
-    currentElement = featureElement(background, 'background');
-    currentStepIndex = 1;
-  };
-
-  this.scenario = function(scenario) {
-    currentElement = featureElement(scenario, 'scenario');
-    currentStepIndex = 1;
-  };
-
-  this.scenarioOutline = function(scenarioOutline) {
-    currentElement = featureElement(scenarioOutline, 'scenario_outline');
-    currentStepIndex = 1;
-  };
-
-  this.step = function(step) {
-    var stepElement = $('.step', $templates).clone();
-    stepElement.appendTo(currentSteps);
-    populate(stepElement, step, 'step');
-
-    if (step.doc_string) {
-      docString = $('.doc_string', $templates).clone();
-      docString.appendTo(stepElement);
-      // TODO: use a syntax highlighter based on the content_type
-      docString.text(step.doc_string.value);
-    }
-    if (step.rows) {
-      dataTable = $('.data_table', $templates).clone();
-      dataTable.appendTo(stepElement);
-      var tBody = dataTable.find('tbody');
-      $.each(step.rows, function(index, row) {
-        var tr = $('<tr></tr>').appendTo(tBody);
-        $.each(row.cells, function(index, cell) {
-          var td = $('<td>' + cell + '</td>').appendTo(tBody);
-        });
-      });
-    }
-  };
-
-  this.examples = function(examples) {
-    var examplesElement = blockElement(currentElement.children('details'), examples, 'examples');
-    var examplesTable = $('.examples_table', $templates).clone();
-    examplesTable.appendTo(examplesElement.children('details'));
-
-    $.each(examples.rows, function(index, row) {
-      var parent = index == 0 ? examplesTable.find('thead') : examplesTable.find('tbody');
-      var tr = $('<tr></tr>').appendTo(parent);
-      $.each(row.cells, function(index, cell) {
-        var td = $('<td>' + cell + '</td>').appendTo(tr);
-      });
-    });
-  };
-
-  this.match = function(match) {
-    currentStep = currentSteps.find('li:nth-child(' + currentStepIndex + ')');
-    currentStepIndex++;
-  };
-
-  this.result = function(result) {
-    currentStep.addClass(result.status);
-    if (result.error_message != '') {
-      populateStepError(currentStep, result.error_message);
-    }
-    currentElement.addClass(result.status);
-    var isLastStep = currentSteps.find('li:nth-child(' + currentStepIndex + ')').length == 0;
-    if (isLastStep) {
-      if (currentSteps.find('.failed').length == 0) {
-        // No failed steps. Collapse it.
-        currentElement.find('details').prop('open', false);
-      } else {
-        currentElement.find('details').attr('open', 'open');
-      }
-    }
-  };
-
-  this.embedding = function(mediaType, data, name) {
-    var nameHtml;
-    if (!name) {
-      nameHtml = "";
-    } else {
-      nameHtml = "<h4>" + name + "</h4>";
-    }
-    if (currentStepIndex == 1) {
-      this.dummyStep();
-    }
-    if (mediaType.match(/^image\//))
-    {
-      currentStep.append(nameHtml + '<img src="' + data + '">');
-    }
-    else if (mediaType.match(/^video\//))
-    {
-      currentStep.append(nameHtml + '<video src="' + data + '" type="' + mediaType + '" autobuffer controls>Your browser doesn\'t support video.</video>');
-    }
-    else if (mediaType.match(/^text\//))
-    {
-      this.write(nameHtml + data);
-    }
-  };
-
-  this.write = function(text) {
-    if (currentStepIndex == 1) {
-      this.dummyStep();
-    }
-    currentStep.append('<pre class="embedded-text">' + text + '</pre>');
-  };
-
-  this.before = function(before) {
-    this.handleHookResult(before);
-  };
-
-  this.after = function(after) {
-    this.handleHookResult(after);
-  };
-
-  this.beforestep = function(beforestep) {
-    this.handleHookResult(beforestep);
-  };
-
-  this.afterstep = function(afterstep) {
-    this.handleHookResult(afterstep);
-  };
-
-  this.handleHookResult = function(hook) {
-      if (hook.status != 'passed' && hook.error_message != '') {
-      this.dummyStep();
-      currentStep.addClass(hook.status);
-      currentElement.addClass(hook.status);
-      populateStepError(currentStep, hook.error_message);
-    }
-  };
-
-  this.dummyStep = function() {
-    var stepElement = $('.step', $templates).clone();
-    stepElement.appendTo(currentSteps);
-    populate(stepElement, {keyword: '', name: ''}, 'step');
-    currentStep = currentSteps.find('li:nth-child(' + currentStepIndex + ')');
-    currentStepIndex++;
-  };
-
-  function featureElement(statement, itemtype) {
-    var e = blockElement(currentFeature.children('details'), statement, itemtype);
-
-    currentSteps = $('.steps', $templates).clone();
-    currentSteps.appendTo(e.children('details'));
-
-    return e;
-  }
-
-  function blockElement(parent, statement, itemtype) {
-    var e = $('.blockelement', $templates).clone();
-    e.appendTo(parent);
-    return populate(e, statement, itemtype);
-  }
-
-  function populate(e, statement, itemtype) {
-    populateTags(e, statement.tags);
-    populateComments(e, statement.comments);
-    e.find('.keyword').text(statement.keyword);
-    e.find('.name').text(statement.name);
-    e.find('.description').text(statement.description);
-    e.attr('itemtype', 'http://cukes.info/microformat/' + itemtype);
-    e.addClass(itemtype);
-    return e;
-  }
-
-  function populateComments(e, comments) {
-    if (comments !== undefined) {
-      var commentsNode = $('.comments', $templates).clone().prependTo(e.find('.header'));
-      $.each(comments, function(index, comment) {
-        var commentNode = $('.comment', $templates).clone().appendTo(commentsNode);
-        commentNode.text(comment.value);
-      });
-    }
-  }
-
-  function populateTags(e, tags) {
-    if (tags !== undefined) {
-      var tagsNode = $('.tags', $templates).clone().prependTo(e.find('.header'));
-      $.each(tags, function(index, tag) {
-        var tagNode = $('.tag', $templates).clone().appendTo(tagsNode);
-        tagNode.text(tag.name);
-      });
-    }
-  }
-
-  function populateStepError(e, error) {
-    if (error !== undefined) {
-      errorNode = $('.error', $templates).clone().appendTo(e);
-      errorNode.text(error);
-    }
-  }
-};
-
-CucumberHTML.templates = '<div>\
-  <section class="blockelement" itemscope>\
-    <details open>\
-      <summary class="header">\
-        <span class="keyword" itemprop="keyword">Keyword</span>: <span itemprop="name" class="name">This is the block name</span>\
-      </summary>\
-      <div itemprop="description" class="description">The description goes here</div>\
-    </details>\
-  </section>\
-\
-  <ol class="steps"></ol>\
-\
-  <ol>\
-    <li class="step"><div class="header"></div><span class="keyword" itemprop="keyword">Keyword</span><span class="name" itemprop="name">Name</span></li>\
-  </ol>\
-\
-  <pre class="doc_string"></pre>\
-\
-  <pre class="error"></pre>\
-\
-  <table class="data_table">\
-    <tbody>\
-    </tbody>\
-  </table>\
-\
-  <table class="examples_table">\
-    <thead></thead>\
-    <tbody></tbody>\
-  </table>\
-\
-  <section class="embed">\
-    <img itemprop="screenshot" class="screenshot" />\
-  </section>\
-  <div class="tags"></div>\
-  <span class="tag"></span>\
-  <div class="comments"></div>\
-  <div class="comment"></div>\
-<div>';
-
-if (typeof module !== 'undefined') {
-  module.exports = CucumberHTML;
-} else if (typeof define !== 'undefined') {
-  define([], function() { return CucumberHTML; });
-}
diff --git a/core/src/main/resources/io/cucumber/core/plugin/html/index.html b/core/src/main/resources/io/cucumber/core/plugin/html/index.html
deleted file mode 100644
index 982462d555..0000000000
--- a/core/src/main/resources/io/cucumber/core/plugin/html/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Cucumber Features</title>
-    <link href="style.css" rel="stylesheet">
-    <script src="jquery-3.4.1.min.js"></script>
-    <script src="formatter.js"></script>
-    <script src="report.js"></script>
-  </head>
-  <body>
-    <div class="cucumber-report"></div>
-  </body>
-</html>
diff --git a/core/src/main/resources/io/cucumber/core/plugin/html/jquery-3.4.1.min.js b/core/src/main/resources/io/cucumber/core/plugin/html/jquery-3.4.1.min.js
deleted file mode 100644
index a1c07fd803..0000000000
--- a/core/src/main/resources/io/cucumber/core/plugin/html/jquery-3.4.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.4.1",k=function(e,t){return new k.fn.init(e,t)},p=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;function d(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}k.fn=k.prototype={jquery:f,constructor:k,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=k.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return k.each(this,e)},map:function(n){return this.pushStack(k.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},k.extend=k.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(k.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||k.isPlainObject(n)?n:{},i=!1,a[t]=k.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},k.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t){b(e,{nonce:t&&t.nonce})},each:function(e,t){var n,r=0;if(d(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(p,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(d(Object(e))?k.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(d(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g.apply([],a)},guid:1,support:y}),"function"==typeof Symbol&&(k.fn[Symbol.iterator]=t[Symbol.iterator]),k.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var h=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,k="sizzle"+1*new Date,m=n.document,S=0,r=0,p=ue(),x=ue(),N=ue(),A=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",$=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",F=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp($),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+$),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ne=function(e,t,n){var r="0x"+t-65536;return r!=r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(m.childNodes),m.childNodes),t[m.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&((e?e.ownerDocument||e:m)!==C&&T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!A[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&U.test(t)){(s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=k),o=(l=h(t)).length;while(o--)l[o]="#"+s+" "+xe(l[o]);c=l.join(","),f=ee.test(t)&&ye(e.parentNode)||e}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){A(t,!0)}finally{s===k&&e.removeAttribute("id")}}}return g(t.replace(B,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[k]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:m;return r!==C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),m!==C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=k,!C.getElementsByName||!C.getElementsByName(k).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){a.appendChild(e).innerHTML="<a id='"+k+"'></a><select id='"+k+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+k+"-]").length||v.push("~="),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+k+"+*").length||v.push(".#.+[+~]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",$)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e===C||e.ownerDocument===m&&y(m,e)?-1:t===C||t.ownerDocument===m&&y(m,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===C?-1:t===C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]===m?-1:s[r]===m?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if((e.ownerDocument||e)!==C&&T(e),d.matchesSelector&&E&&!A[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){A(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!==C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!==C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=p[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&p(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(F," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[S,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===S&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[k]||(a[k]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[S,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[k]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace(B,"$1"));return s[k]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[S,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[k]||(e[k]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===S&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[k]&&(v=Ce(v)),y&&!y[k]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[k]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace(B,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace(B," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=N[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[k]?i.push(a):o.push(a);(a=N(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=S+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t===C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument===C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(S=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(S=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=k.split("").sort(D).join("")===k,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);k.find=h,k.expr=h.selectors,k.expr[":"]=k.expr.pseudos,k.uniqueSort=k.unique=h.uniqueSort,k.text=h.getText,k.isXMLDoc=h.isXML,k.contains=h.contains,k.escapeSelector=h.escape;var T=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&k(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},N=k.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var D=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?k.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?k.grep(e,function(e){return e===n!==r}):"string"!=typeof n?k.grep(e,function(e){return-1<i.call(n,e)!==r}):k.filter(n,e,r)}k.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?k.find.matchesSelector(r,e)?[r]:[]:k.find.matches(e,k.grep(t,function(e){return 1===e.nodeType}))},k.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(k(e).filter(function(){for(t=0;t<r;t++)if(k.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)k.find(e,i[t],n);return 1<r?k.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&N.test(e)?k(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(k.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:L.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof k?t[0]:t,k.merge(this,k.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),D.test(r[1])&&k.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(k):k.makeArray(e,this)}).prototype=k.fn,q=k(E);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}k.fn.extend({has:function(e){var t=k(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(k.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&k(e);if(!N.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&k.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?k.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(k(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(k.uniqueSort(k.merge(this.get(),k(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),k.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return T(e,"parentNode")},parentsUntil:function(e,t,n){return T(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return T(e,"nextSibling")},prevAll:function(e){return T(e,"previousSibling")},nextUntil:function(e,t,n){return T(e,"nextSibling",n)},prevUntil:function(e,t,n){return T(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return"undefined"!=typeof e.contentDocument?e.contentDocument:(A(e,"template")&&(e=e.content||e),k.merge([],e.childNodes))}},function(r,i){k.fn[r]=function(e,t){var n=k.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=k.filter(t,n)),1<this.length&&(O[r]||k.uniqueSort(n),H.test(r)&&n.reverse()),this.pushStack(n)}});var R=/[^\x20\t\r\n\f]+/g;function M(e){return e}function I(e){throw e}function W(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}k.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},k.each(e.match(R)||[],function(e,t){n[t]=!0}),n):k.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){k.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return k.each(arguments,function(e,t){var n;while(-1<(n=k.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<k.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},k.extend({Deferred:function(e){var o=[["notify","progress",k.Callbacks("memory"),k.Callbacks("memory"),2],["resolve","done",k.Callbacks("once memory"),k.Callbacks("once memory"),0,"resolved"],["reject","fail",k.Callbacks("once memory"),k.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return k.Deferred(function(r){k.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,M,s),l(u,o,I,s)):(u++,t.call(e,l(u,o,M,s),l(u,o,I,s),l(u,o,M,o.notifyWith))):(a!==M&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){k.Deferred.exceptionHook&&k.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==I&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(k.Deferred.getStackHook&&(t.stackTrace=k.Deferred.getStackHook()),C.setTimeout(t))}}return k.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:M,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:M)),o[2][3].add(l(0,e,m(n)?n:I))}).promise()},promise:function(e){return null!=e?k.extend(e,a):a}},s={};return k.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=k.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(W(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)W(i[t],a(t),o.reject);return o.promise()}});var $=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;k.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&$.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},k.readyException=function(e){C.setTimeout(function(){throw e})};var F=k.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),k.ready()}k.fn.ready=function(e){return F.then(e)["catch"](function(e){k.readyException(e)}),this},k.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--k.readyWait:k.isReady)||(k.isReady=!0)!==e&&0<--k.readyWait||F.resolveWith(E,[k])}}),k.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(k.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var _=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)_(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(k(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},z=/^-ms-/,U=/-([a-z])/g;function X(e,t){return t.toUpperCase()}function V(e){return e.replace(z,"ms-").replace(U,X)}var G=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Y(){this.expando=k.expando+Y.uid++}Y.uid=1,Y.prototype={cache:function(e){var t=e[this.expando];return t||(t={},G(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[V(t)]=n;else for(r in t)i[V(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][V(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(V):(t=V(t))in r?[t]:t.match(R)||[]).length;while(n--)delete r[t[n]]}(void 0===t||k.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!k.isEmptyObject(t)}};var Q=new Y,J=new Y,K=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,Z=/[A-Z]/g;function ee(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(Z,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:K.test(i)?JSON.parse(i):i)}catch(e){}J.set(e,t,n)}else n=void 0;return n}k.extend({hasData:function(e){return J.hasData(e)||Q.hasData(e)},data:function(e,t,n){return J.access(e,t,n)},removeData:function(e,t){J.remove(e,t)},_data:function(e,t,n){return Q.access(e,t,n)},_removeData:function(e,t){Q.remove(e,t)}}),k.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=J.get(o),1===o.nodeType&&!Q.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=V(r.slice(5)),ee(o,r,i[r]));Q.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){J.set(this,n)}):_(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=J.get(o,n))?t:void 0!==(t=ee(o,n))?t:void 0;this.each(function(){J.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){J.remove(this,e)})}}),k.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Q.get(e,t),n&&(!r||Array.isArray(n)?r=Q.access(e,t,k.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=k.queue(e,t),r=n.length,i=n.shift(),o=k._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){k.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Q.get(e,n)||Q.access(e,n,{empty:k.Callbacks("once memory").add(function(){Q.remove(e,[t+"queue",n])})})}}),k.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?k.queue(this[0],t):void 0===n?this:this.each(function(){var e=k.queue(this,t,n);k._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&k.dequeue(this,t)})},dequeue:function(e){return this.each(function(){k.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=k.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Q.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var te=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ne=new RegExp("^(?:([+-])=|)("+te+")([a-z%]*)$","i"),re=["Top","Right","Bottom","Left"],ie=E.documentElement,oe=function(e){return k.contains(e.ownerDocument,e)},ae={composed:!0};ie.getRootNode&&(oe=function(e){return k.contains(e.ownerDocument,e)||e.getRootNode(ae)===e.ownerDocument});var se=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&oe(e)&&"none"===k.css(e,"display")},ue=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];for(o in i=n.apply(e,r||[]),t)e.style[o]=a[o];return i};function le(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return k.css(e,t,"")},u=s(),l=n&&n[3]||(k.cssNumber[t]?"":"px"),c=e.nodeType&&(k.cssNumber[t]||"px"!==l&&+u)&&ne.exec(k.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)k.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,k.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ce={};function fe(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Q.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&se(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ce[s])||(o=a.body.appendChild(a.createElement(s)),u=k.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ce[s]=u)))):"none"!==n&&(l[c]="none",Q.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}k.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){se(this)?k(this).show():k(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?k.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Q.set(e[n],"globalEval",!t||Q.get(t[n],"globalEval"))}ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;var me,xe,be=/<|&#?\w+;/;function we(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))k.merge(p,o.nodeType?[o]:o);else if(be.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+k.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;k.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<k.inArray(o,r))i&&i.push(o);else if(l=oe(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}me=E.createDocumentFragment().appendChild(E.createElement("div")),(xe=E.createElement("input")).setAttribute("type","radio"),xe.setAttribute("checked","checked"),xe.setAttribute("name","t"),me.appendChild(xe),y.checkClone=me.cloneNode(!0).cloneNode(!0).lastChild.checked,me.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!me.cloneNode(!0).lastChild.defaultValue;var Te=/^key/,Ce=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ee=/^([^.]*)(?:\.(.+)|)/;function ke(){return!0}function Se(){return!1}function Ne(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ae(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ae(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Se;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return k().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=k.guid++)),e.each(function(){k.event.add(this,t,i,r,n)})}function De(e,i,o){o?(Q.set(e,i,!1),k.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Q.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(k.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Q.set(this,i,r),t=o(this,i),this[i](),r!==(n=Q.get(this,i))||t?Q.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Q.set(this,i,{value:k.event.trigger(k.extend(r[0],k.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Q.get(e,i)&&k.event.add(e,i,ke)}k.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.get(t);if(v){n.handler&&(n=(o=n).handler,i=o.selector),i&&k.find.matchesSelector(ie,i),n.guid||(n.guid=k.guid++),(u=v.events)||(u=v.events={}),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof k&&k.event.triggered!==e.type?k.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(R)||[""]).length;while(l--)d=g=(s=Ee.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=k.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=k.event.special[d]||{},c=k.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&k.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),k.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Q.hasData(e)&&Q.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(R)||[""]).length;while(l--)if(d=g=(s=Ee.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=k.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||k.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)k.event.remove(e,d+t[l],n,r,!0);k.isEmptyObject(u)&&Q.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=k.event.fix(e),u=new Array(arguments.length),l=(Q.get(this,"events")||{})[s.type]||[],c=k.event.special[s.type]||{};for(u[0]=s,t=1;t<arguments.length;t++)u[t]=arguments[t];if(s.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,s)){a=k.event.handlers.call(this,s,l),t=0;while((i=a[t++])&&!s.isPropagationStopped()){s.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!s.isImmediatePropagationStopped())s.rnamespace&&!1!==o.namespace&&!s.rnamespace.test(o.namespace)||(s.handleObj=o,s.data=o.data,void 0!==(r=((k.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,u))&&!1===(s.result=r)&&(s.preventDefault(),s.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,s),s.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<k(i,this).index(l):k.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(k.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[k.expando]?e:new k.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click",ke),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&De(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Q.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},k.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},k.Event=function(e,t){if(!(this instanceof k.Event))return new k.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?ke:Se,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&k.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[k.expando]=!0},k.Event.prototype={constructor:k.Event,isDefaultPrevented:Se,isPropagationStopped:Se,isImmediatePropagationStopped:Se,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=ke,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=ke,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=ke,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},k.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&Te.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Ce.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},k.event.addProp),k.each({focus:"focusin",blur:"focusout"},function(e,t){k.event.special[e]={setup:function(){return De(this,e,Ne),!1},trigger:function(){return De(this,e),!0},delegateType:t}}),k.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){k.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||k.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),k.fn.extend({on:function(e,t,n,r){return Ae(this,e,t,n,r)},one:function(e,t,n,r){return Ae(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,k(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Se),this.each(function(){k.event.remove(this,e,n,t)})}});var je=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,qe=/<script|<style|<link/i,Le=/checked\s*(?:[^=]|=\s*.checked.)/i,He=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Oe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&k(e).children("tbody")[0]||e}function Pe(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Re(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Me(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(Q.hasData(e)&&(o=Q.access(e),a=Q.set(t,o),l=o.events))for(i in delete a.handle,a.events={},l)for(n=0,r=l[i].length;n<r;n++)k.event.add(t,i,l[i][n]);J.hasData(e)&&(s=J.access(e),u=k.extend({},s),J.set(t,u))}}function Ie(n,r,i,o){r=g.apply([],r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Le.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Ie(t,r,i,o)});if(f&&(t=(e=we(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=k.map(ve(e,"script"),Pe)).length;c<f;c++)u=e,c!==p&&(u=k.clone(u,!0,!0),s&&k.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,k.map(a,Re),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Q.access(u,"globalEval")&&k.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?k._evalUrl&&!u.noModule&&k._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")}):b(u.textContent.replace(He,""),u,l))}return n}function We(e,t,n){for(var r,i=t?k.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||k.cleanData(ve(r)),r.parentNode&&(n&&oe(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}k.extend({htmlPrefilter:function(e){return e.replace(je,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=oe(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||k.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Me(o[r],a[r]);else Me(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=k.event.special,o=0;void 0!==(n=e[o]);o++)if(G(n)){if(t=n[Q.expando]){if(t.events)for(r in t.events)i[r]?k.event.remove(n,r):k.removeEvent(n,r,t.handle);n[Q.expando]=void 0}n[J.expando]&&(n[J.expando]=void 0)}}}),k.fn.extend({detach:function(e){return We(this,e,!0)},remove:function(e){return We(this,e)},text:function(e){return _(this,function(e){return void 0===e?k.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Ie(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Oe(this,e).appendChild(e)})},prepend:function(){return Ie(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Oe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Ie(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(k.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return k.clone(this,e,t)})},html:function(e){return _(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!qe.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=k.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(k.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Ie(this,arguments,function(e){var t=this.parentNode;k.inArray(this,n)<0&&(k.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),k.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){k.fn[e]=function(e){for(var t,n=[],r=k(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),k(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var $e=new RegExp("^("+te+")(?!px)[a-z%]+$","i"),Fe=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Be=new RegExp(re.join("|"),"i");function _e(e,t,n){var r,i,o,a,s=e.style;return(n=n||Fe(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||oe(e)||(a=k.style(e,t)),!y.pixelBoxStyles()&&$e.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function ze(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(u){s.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",u.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",ie.appendChild(s).appendChild(u);var e=C.getComputedStyle(u);n="1%"!==e.top,a=12===t(e.marginLeft),u.style.right="60%",o=36===t(e.right),r=36===t(e.width),u.style.position="absolute",i=12===t(u.offsetWidth/3),ie.removeChild(s),u=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s=E.createElement("div"),u=E.createElement("div");u.style&&(u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===u.style.backgroundClip,k.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),a},scrollboxSize:function(){return e(),i}}))}();var Ue=["Webkit","Moz","ms"],Xe=E.createElement("div").style,Ve={};function Ge(e){var t=k.cssProps[e]||Ve[e];return t||(e in Xe?e:Ve[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Ue.length;while(n--)if((e=Ue[n]+t)in Xe)return e}(e)||e)}var Ye=/^(none|table(?!-c[ea]).+)/,Qe=/^--/,Je={position:"absolute",visibility:"hidden",display:"block"},Ke={letterSpacing:"0",fontWeight:"400"};function Ze(e,t,n){var r=ne.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function et(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=k.css(e,n+re[a],!0,i)),r?("content"===n&&(u-=k.css(e,"padding"+re[a],!0,i)),"margin"!==n&&(u-=k.css(e,"border"+re[a]+"Width",!0,i))):(u+=k.css(e,"padding"+re[a],!0,i),"padding"!==n?u+=k.css(e,"border"+re[a]+"Width",!0,i):s+=k.css(e,"border"+re[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function tt(e,t,n){var r=Fe(e),i=(!y.boxSizingReliable()||n)&&"border-box"===k.css(e,"boxSizing",!1,r),o=i,a=_e(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if($e.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||"auto"===a||!parseFloat(a)&&"inline"===k.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===k.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+et(e,t,n||(i?"border":"content"),o,r,a)+"px"}function nt(e,t,n,r,i){return new nt.prototype.init(e,t,n,r,i)}k.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=_e(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=V(t),u=Qe.test(t),l=e.style;if(u||(t=Ge(s)),a=k.cssHooks[t]||k.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=ne.exec(n))&&i[1]&&(n=le(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(k.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=V(t);return Qe.test(t)||(t=Ge(s)),(a=k.cssHooks[t]||k.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=_e(e,t,r)),"normal"===i&&t in Ke&&(i=Ke[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),k.each(["height","width"],function(e,u){k.cssHooks[u]={get:function(e,t,n){if(t)return!Ye.test(k.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?tt(e,u,n):ue(e,Je,function(){return tt(e,u,n)})},set:function(e,t,n){var r,i=Fe(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===k.css(e,"boxSizing",!1,i),s=n?et(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-et(e,u,"border",!1,i)-.5)),s&&(r=ne.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=k.css(e,u)),Ze(0,t,s)}}}),k.cssHooks.marginLeft=ze(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(_e(e,"marginLeft"))||e.getBoundingClientRect().left-ue(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),k.each({margin:"",padding:"",border:"Width"},function(i,o){k.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+re[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(k.cssHooks[i+o].set=Ze)}),k.fn.extend({css:function(e,t){return _(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Fe(e),i=t.length;a<i;a++)o[t[a]]=k.css(e,t[a],!1,r);return o}return void 0!==n?k.style(e,t,n):k.css(e,t)},e,t,1<arguments.length)}}),((k.Tween=nt).prototype={constructor:nt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||k.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(k.cssNumber[n]?"":"px")},cur:function(){var e=nt.propHooks[this.prop];return e&&e.get?e.get(this):nt.propHooks._default.get(this)},run:function(e){var t,n=nt.propHooks[this.prop];return this.options.duration?this.pos=t=k.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):nt.propHooks._default.set(this),this}}).init.prototype=nt.prototype,(nt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=k.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){k.fx.step[e.prop]?k.fx.step[e.prop](e):1!==e.elem.nodeType||!k.cssHooks[e.prop]&&null==e.elem.style[Ge(e.prop)]?e.elem[e.prop]=e.now:k.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=nt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},k.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},k.fx=nt.prototype.init,k.fx.step={};var rt,it,ot,at,st=/^(?:toggle|show|hide)$/,ut=/queueHooks$/;function lt(){it&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(lt):C.setTimeout(lt,k.fx.interval),k.fx.tick())}function ct(){return C.setTimeout(function(){rt=void 0}),rt=Date.now()}function ft(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=re[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function pt(e,t,n){for(var r,i=(dt.tweeners[t]||[]).concat(dt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function dt(o,e,t){var n,a,r=0,i=dt.prefilters.length,s=k.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=rt||ct(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:k.extend({},e),opts:k.extend(!0,{specialEasing:{},easing:k.easing._default},t),originalProperties:e,originalOptions:t,startTime:rt||ct(),duration:t.duration,tweens:[],createTween:function(e,t){var n=k.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=V(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=k.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=dt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(k._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return k.map(c,pt,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),k.fx.timer(k.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}k.Animation=k.extend(dt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return le(n.elem,e,ne.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(R);for(var n,r=0,i=e.length;r<i;r++)n=e[r],dt.tweeners[n]=dt.tweeners[n]||[],dt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&se(e),v=Q.get(e,"fxshow");for(r in n.queue||(null==(a=k._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,k.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],st.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||k.style(e,r)}if((u=!k.isEmptyObject(t))||!k.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Q.get(e,"display")),"none"===(c=k.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=k.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===k.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Q.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&fe([e],!0),p.done(function(){for(r in g||fe([e]),Q.remove(e,"fxshow"),d)k.style(e,r,d[r])})),u=pt(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?dt.prefilters.unshift(e):dt.prefilters.push(e)}}),k.speed=function(e,t,n){var r=e&&"object"==typeof e?k.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return k.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in k.fx.speeds?r.duration=k.fx.speeds[r.duration]:r.duration=k.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&k.dequeue(this,r.queue)},r},k.fn.extend({fadeTo:function(e,t,n,r){return this.filter(se).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=k.isEmptyObject(t),o=k.speed(e,n,r),a=function(){var e=dt(this,k.extend({},t),o);(i||Q.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&!1!==i&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=k.timers,r=Q.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&ut.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||k.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Q.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=k.timers,o=n?n.length:0;for(t.finish=!0,k.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),k.each(["toggle","show","hide"],function(e,r){var i=k.fn[r];k.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(ft(r,!0),e,t,n)}}),k.each({slideDown:ft("show"),slideUp:ft("hide"),slideToggle:ft("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){k.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),k.timers=[],k.fx.tick=function(){var e,t=0,n=k.timers;for(rt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||k.fx.stop(),rt=void 0},k.fx.timer=function(e){k.timers.push(e),k.fx.start()},k.fx.interval=13,k.fx.start=function(){it||(it=!0,lt())},k.fx.stop=function(){it=null},k.fx.speeds={slow:600,fast:200,_default:400},k.fn.delay=function(r,e){return r=k.fx&&k.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},ot=E.createElement("input"),at=E.createElement("select").appendChild(E.createElement("option")),ot.type="checkbox",y.checkOn=""!==ot.value,y.optSelected=at.selected,(ot=E.createElement("input")).value="t",ot.type="radio",y.radioValue="t"===ot.value;var ht,gt=k.expr.attrHandle;k.fn.extend({attr:function(e,t){return _(this,k.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){k.removeAttr(this,e)})}}),k.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?k.prop(e,t,n):(1===o&&k.isXMLDoc(e)||(i=k.attrHooks[t.toLowerCase()]||(k.expr.match.bool.test(t)?ht:void 0)),void 0!==n?null===n?void k.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=k.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(R);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ht={set:function(e,t,n){return!1===t?k.removeAttr(e,n):e.setAttribute(n,n),n}},k.each(k.expr.match.bool.source.match(/\w+/g),function(e,t){var a=gt[t]||k.find.attr;gt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=gt[o],gt[o]=r,r=null!=a(e,t,n)?o:null,gt[o]=i),r}});var vt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;function mt(e){return(e.match(R)||[]).join(" ")}function xt(e){return e.getAttribute&&e.getAttribute("class")||""}function bt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(R)||[]}k.fn.extend({prop:function(e,t){return _(this,k.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[k.propFix[e]||e]})}}),k.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&k.isXMLDoc(e)||(t=k.propFix[t]||t,i=k.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=k.find.attr(e,"tabindex");return t?parseInt(t,10):vt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(k.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),k.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){k.propFix[this.toLowerCase()]=this}),k.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).addClass(t.call(this,e,xt(this)))});if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){k(this).removeClass(t.call(this,e,xt(this)))});if(!arguments.length)return this.attr("class","");if((e=bt(t)).length)while(n=this[u++])if(i=xt(n),r=1===n.nodeType&&" "+mt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=mt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){k(this).toggleClass(i.call(this,e,xt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=k(this),r=bt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=xt(this))&&Q.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Q.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+mt(xt(n))+" ").indexOf(t))return!0;return!1}});var wt=/\r/g;k.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,k(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=k.map(t,function(e){return null==e?"":e+""})),(r=k.valHooks[this.type]||k.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=k.valHooks[t.type]||k.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(wt,""):null==e?"":e:void 0}}),k.extend({valHooks:{option:{get:function(e){var t=k.find.attr(e,"value");return null!=t?t:mt(k.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=k(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=k.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<k.inArray(k.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),k.each(["radio","checkbox"],function(){k.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<k.inArray(k(e).val(),t)}},y.checkOn||(k.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var Tt=/^(?:focusinfocus|focusoutblur)$/,Ct=function(e){e.stopPropagation()};k.extend(k.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!Tt.test(d+k.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[k.expando]?e:new k.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:k.makeArray(t,[e]),c=k.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,Tt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Q.get(o,"events")||{})[e.type]&&Q.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&G(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!G(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),k.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,Ct),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,Ct),k.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=k.extend(new k.Event,n,{type:e,isSimulated:!0});k.event.trigger(r,null,t)}}),k.fn.extend({trigger:function(e,t){return this.each(function(){k.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return k.event.trigger(e,t,n,!0)}}),y.focusin||k.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){k.event.simulate(r,e.target,k.event.fix(e))};k.event.special[r]={setup:function(){var e=this.ownerDocument||this,t=Q.access(e,r);t||e.addEventListener(n,i,!0),Q.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this,t=Q.access(e,r)-1;t?Q.access(e,r,t):(e.removeEventListener(n,i,!0),Q.remove(e,r))}}});var Et=C.location,kt=Date.now(),St=/\?/;k.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||k.error("Invalid XML: "+e),t};var Nt=/\[\]$/,At=/\r?\n/g,Dt=/^(?:submit|button|image|reset|file)$/i,jt=/^(?:input|select|textarea|keygen)/i;function qt(n,e,r,i){var t;if(Array.isArray(e))k.each(e,function(e,t){r||Nt.test(n)?i(n,t):qt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)qt(n+"["+t+"]",e[t],r,i)}k.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!k.isPlainObject(e))k.each(e,function(){i(this.name,this.value)});else for(n in e)qt(n,e[n],t,i);return r.join("&")},k.fn.extend({serialize:function(){return k.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=k.prop(this,"elements");return e?k.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!k(this).is(":disabled")&&jt.test(this.nodeName)&&!Dt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=k(this).val();return null==n?null:Array.isArray(n)?k.map(n,function(e){return{name:t.name,value:e.replace(At,"\r\n")}}):{name:t.name,value:n.replace(At,"\r\n")}}).get()}});var Lt=/%20/g,Ht=/#.*$/,Ot=/([?&])_=[^&]*/,Pt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Rt=/^(?:GET|HEAD)$/,Mt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Ft=E.createElement("a");function Bt(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(R)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function _t(t,i,o,a){var s={},u=t===Wt;function l(e){var r;return s[e]=!0,k.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function zt(e,t){var n,r,i=k.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&k.extend(!0,e,r),e}Ft.href=Et.href,k.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Et.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Et.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":k.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,k.ajaxSettings),t):zt(k.ajaxSettings,e)},ajaxPrefilter:Bt(It),ajaxTransport:Bt(Wt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=k.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?k(y):k.event,x=k.Deferred(),b=k.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Pt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Et.href)+"").replace(Mt,Et.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(R)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Ft.protocol+"//"+Ft.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=k.param(v.data,v.traditional)),_t(It,v,t,T),h)return T;for(i in(g=k.event&&v.global)&&0==k.active++&&k.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Rt.test(v.type),f=v.url.replace(Ht,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Lt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(St.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Ot,"$1"),o=(St.test(f)?"&":"?")+"_="+kt+++o),v.url=f+o),v.ifModified&&(k.lastModified[f]&&T.setRequestHeader("If-Modified-Since",k.lastModified[f]),k.etag[f]&&T.setRequestHeader("If-None-Match",k.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+$t+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=_t(Wt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(k.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(k.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--k.active||k.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return k.get(e,t,n,"json")},getScript:function(e,t){return k.get(e,void 0,t,"script")}}),k.each(["get","post"],function(e,i){k[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),k.ajax(k.extend({url:e,type:i,dataType:r,data:t,success:n},k.isPlainObject(e)&&e))}}),k._evalUrl=function(e,t){return k.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){k.globalEval(e,t)}})},k.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=k(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){k(this).wrapInner(n.call(this,e))}):this.each(function(){var e=k(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){k(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){k(this).replaceWith(this.childNodes)}),this}}),k.expr.pseudos.hidden=function(e){return!k.expr.pseudos.visible(e)},k.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},k.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Ut={0:200,1223:204},Xt=k.ajaxSettings.xhr();y.cors=!!Xt&&"withCredentials"in Xt,y.ajax=Xt=!!Xt,k.ajaxTransport(function(i){var o,a;if(y.cors||Xt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Ut[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),k.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),k.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return k.globalEval(e),e}}}),k.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),k.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=k("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Vt,Gt=[],Yt=/(=)\?(?=&|$)|\?\?/;k.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Gt.pop()||k.expando+"_"+kt++;return this[e]=!0,e}}),k.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Yt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Yt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Yt,"$1"+r):!1!==e.jsonp&&(e.url+=(St.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||k.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?k(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Gt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Vt=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Vt.childNodes.length),k.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=D.exec(e))?[t.createElement(i[1])]:(i=we([e],t,o),o&&o.length&&k(o).remove(),k.merge([],i.childNodes)));var r,i,o},k.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=mt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&k.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?k("<div>").append(k.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},k.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){k.fn[t]=function(e){return this.on(t,e)}}),k.expr.pseudos.animated=function(t){return k.grep(k.timers,function(e){return t===e.elem}).length},k.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=k.css(e,"position"),c=k(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=k.css(e,"top"),u=k.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,k.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},k.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){k.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===k.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===k.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=k(e).offset()).top+=k.css(e,"borderTopWidth",!0),i.left+=k.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-k.css(r,"marginTop",!0),left:t.left-i.left-k.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===k.css(e,"position"))e=e.offsetParent;return e||ie})}}),k.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;k.fn[t]=function(e){return _(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),k.each(["top","left"],function(e,n){k.cssHooks[n]=ze(y.pixelPosition,function(e,t){if(t)return t=_e(e,n),$e.test(t)?k(e).position()[n]+"px":t})}),k.each({Height:"height",Width:"width"},function(a,s){k.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){k.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return _(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?k.css(e,t,i):k.style(e,t,n,i)},s,n?e:void 0,n)}})}),k.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){k.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}}),k.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),k.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),k.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||k.guid++,i},k.holdReady=function(e){e?k.readyWait++:k.ready(!0)},k.isArray=Array.isArray,k.parseJSON=JSON.parse,k.nodeName=A,k.isFunction=m,k.isWindow=x,k.camelCase=V,k.type=w,k.now=Date.now,k.isNumeric=function(e){var t=k.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return k});var Qt=C.jQuery,Jt=C.$;return k.noConflict=function(e){return C.$===k&&(C.$=Jt),e&&C.jQuery===k&&(C.jQuery=Qt),k},e||(C.jQuery=C.$=k),k});
diff --git a/core/src/main/resources/io/cucumber/core/plugin/html/report.js b/core/src/main/resources/io/cucumber/core/plugin/html/report.js
deleted file mode 100644
index e5b1a3f31e..0000000000
--- a/core/src/main/resources/io/cucumber/core/plugin/html/report.js
+++ /dev/null
@@ -1,93 +0,0 @@
-$(document).ready(function() {
-  var formatter = new CucumberHTML.DOMFormatter($('.cucumber-report'));
-var N = document.location.hash ? parseInt(document.location.hash.substring(1)) : 1;
-var start = new Date().getTime();
-for(var n = 0; n < N; n++) {
-  formatter.uri('report.feature');
-  formatter.feature({
-    comments: [
-      {value: "# A comment"},
-      {value: "# Another comment"}
-    ],
-    keyword:'Feature',
-    name:'Generating html report',
-    description: 'It could be useful to have an html report to facilitate documentation reading.\n\nEspecially when the whitespace formatting is preserved',
-    line:2
-  });
-
-  formatter.background({
-    comments: [
-      {value: "# Background comment"}
-    ],
-    keyword:'Background',
-    name:'Setting up the context',
-    line:3,
-    description: 'These steps will be executed before each scenario.'
-  });
-  formatter.write('Output from before hook');
-  formatter.embedding('text/plain', 'Text embedding from before hook');
-  formatter.step({keyword:'Given ', name:'I have a background', line:4});
-  formatter.step({keyword:'And ', name:'I set some context', line: 5});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'passed', duration: 0});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'passed', duration: 0});
-
-  formatter.before({status: 'passed', duration: 668816288});
-  formatter.scenario({"tags":[{"name":"@foo","line":3},{"name":"@bar","line":4},{"name":"@doh","line":5}], keyword:'Scenario', name: 'Creating a simple report', line: 6});
-  formatter.step({comments: [
-    {value: "# Step comment 1"},
-    {value: "# Step comment 2"}
-  ],keyword:'Given ', name:'I have a feature', line: 7, doc_string:{value: "A\ndoc string\non several lines", content_type:"text/plain", line:8}});
-  formatter.step({keyword:'When ', name:'I format it', line: 11});
-  formatter.step({keyword:'Then ', name:'It should look pretty', line: 12});
-  formatter.step({keyword:'And ', name:'It should show tables', line: 13, rows: [{cells:['name', 'price'], line: 14}, {cells:['milk', '9'], line: 15}]});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'passed', duration: 0});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'failed', error_message:'something went wrong...', duration: 0});
-  formatter.embedding('image/png', 'bubble_256x256.png');
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'undefined', duration: 0});
-  formatter.embedding('text/plain', 'Look at this video');
-  formatter.embedding('video/mp4', 'http://www.808.dk/pics/video/gizmo.mp4');
-  formatter.embedding('text/plain', 'Look at this multi-line embedding\nReal fancy');
-  formatter.write('What a nice helicopter');
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'skipped', duration: 0});
-  formatter.after({status: 'passed', duration: 668816288});
-
-  formatter.scenarioOutline({keyword:'Scenario Outline', name: 'Scenario with examples', description:'It should be good to format outlined arguments.', line: 16});
-  formatter.step({keyword:'Given ', name:'I have a <name> which costs <price>', line: 17});
-  formatter.examples({description:'', name:'Some good examples', keyword:'Examples', line: 18, rows:[{cells:['name', 'price'], line:19}, {cells:['milk', '9'], line:20}, {cells:['bread', '7'], line:21}, {cells:['soap', '5'], line:22}]});
-  formatter.before({status: 'passed', duration: 668816288});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'passed', duration: 0});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'passed', duration: 0});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'failed', error_message:'I didn\'t do it.', duration: 0});
-  formatter.after({status: 'failed', duration: 668816288, "error_message": 'com.example.MyDodgyException: Widget underflow\r\n\tat org.codehaus.groovy.runtime.metaclass.ClosureMetaClass.invokeMethod(ClosureMetaClass.java:264)\r\n\tat com.example.WidgetFurbicator.furbicateWidgets(WidgetFurbicator.java:678)'});
-
-  formatter.scenario({"tags":[{"name":"@stephooks","line":24}], keyword:'Scenario', name: 'Scenario with step hooks', line: 25});
-  formatter.before({status: 'passed', duration: 668816288});
-  formatter.beforestep({status: 'passed', duration: 668816288});
-  formatter.step({keyword:'Given ', name:'step 1', line: 26});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'passed', duration: 0});
-  formatter.afterstep({status: 'passed', duration: 668816288});
-  formatter.beforestep({status: 'failed', duration: 668816288, "error_message": 'com.example.MyDodgyException: Widget underflow\r\n\tat org.codehaus.groovy.runtime.metaclass.ClosureMetaClass.invokeMethod(ClosureMetaClass.java:264)\r\n\tat com.example.StepDefinitions.beforeStepHook()'});
-  formatter.step({keyword:'When ', name:'step 2', line: 27});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'skipped', duration: 0});
-  formatter.afterstep({status: 'failed', duration: 668816288, "error_message": 'com.example.MyDodgyException: Widget underflow\r\n\tat org.codehaus.groovy.runtime.metaclass.ClosureMetaClass.invokeMethod(ClosureMetaClass.java:264)\r\n\tat com.example.StepDefinitions.afterStepHook()'});
-  formatter.beforestep({status: 'skipped', duration: 0});
-  formatter.step({keyword:'Then ', name:'step 3', line: 28});
-  formatter.match({uri:'report.feature'});
-  formatter.result({status:'skipped', duration: 0});
-  formatter.afterstep({status: 'skipped', duration: 0});
-  formatter.after({status: 'passed', duration: 668816288});
-}
-console.log('Rendered %s features in %s ms', N, new Date().getTime() - start);
-
-});
diff --git a/core/src/main/resources/io/cucumber/core/plugin/html/style.css b/core/src/main/resources/io/cucumber/core/plugin/html/style.css
deleted file mode 100644
index 674452e85a..0000000000
--- a/core/src/main/resources/io/cucumber/core/plugin/html/style.css
+++ /dev/null
@@ -1,97 +0,0 @@
-.cucumber-report .body {
-  font-family: Helvetica,Arial,sans-serif;
-}
-
-.cucumber-report .keyword {
-  font-weight: bold;
-}
-
-.cucumber-report .description {
-  font-style: italic;
-  margin-left: 20px;
-  white-space: pre;
-}
-
-.cucumber-report details > section {
-  margin-left: 20px;
-}
-
-.cucumber-report ol.steps {
-  list-style-type: none;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-.cucumber-report .step .embedded-text {
-  background: #dddddd;
-}
-
-.cucumber-report .doc_string {
-  margin: 0 0 0 20px;
-}
-
-.cucumber-report table {
-  border-collapse: collapse;
-  border: 1px;
-  border-style: solid;
-}
-
-.cucumber-report td, .cucumber-report th {
-  border: 1px;
-  border-style: solid;
-  padding-left: 4px;
-  padding-right: 4px;
-}
-
-.cucumber-report table {
-  margin-left: 20px;
-}
-
-.cucumber-report thead {
-  background-color: #C0C0C0;
-}
-
-.cucumber-report .passed {
-  background-color: #C5D88A;
-}
-
-.cucumber-report .undefined, .cucumber-report .pending {
-  background-color: #EAEC2D;
-}
-
-.cucumber-report .skipped {
-  background-color: #2DEAEC;
-}
-
-.cucumber-report .failed {
-  background-color: #D88A8A;
-}
-
-.cucumber-report .tags {
-  display: inline;
-}
-
-.cucumber-report .tag {
-  margin-right: 0.25em;
-  color: #246ac1;
-}
-
-.cucumber-report .comments {
-  display: inline;
-}
-
-.cucumber-report .comment {
-  margin: 0;
-  padding: 0;
-}
-
-.cucumber-report .error {
-  margin: .2em .75em;
-  padding: .2em;
-  border: 1px solid #900;
-  background-color: #EDBBBB;
-}
-
-#cucumber-templates {
-  display: none;
-}
diff --git a/core/src/test/java/io/cucumber/core/options/CucumberOptionsAnnotationParserTest.java b/core/src/test/java/io/cucumber/core/options/CucumberOptionsAnnotationParserTest.java
index c801e7c047..b9f2f379be 100644
--- a/core/src/test/java/io/cucumber/core/options/CucumberOptionsAnnotationParserTest.java
+++ b/core/src/test/java/io/cucumber/core/options/CucumberOptionsAnnotationParserTest.java
@@ -156,7 +156,7 @@ void inherit_plugin_from_baseclass() {
         List<Plugin> pluginList = plugins.getPlugins();
 
         assertAll("Checking Plugin",
-            () -> assertPluginExists(pluginList, "io.cucumber.core.plugin.JSONFormatter"),
+            () -> assertPluginExists(pluginList, "io.cucumber.core.plugin.HtmlFormatter"),
             () -> assertPluginExists(pluginList, "io.cucumber.core.plugin.PrettyFormatter")
         );
     }
@@ -255,7 +255,7 @@ private static class SubClassWithFormatter extends BaseClassWithFormatter {
         // empty
     }
 
-    @CucumberOptions(plugin = "json:target/test-json-report.json")
+    @CucumberOptions(plugin = "html:target/test-report.html")
     private static class BaseClassWithFormatter {
         // empty
     }
diff --git a/core/src/test/java/io/cucumber/core/options/CucumberPropertiesParserTest.java b/core/src/test/java/io/cucumber/core/options/CucumberPropertiesParserTest.java
index 7522dff485..610be33d7a 100644
--- a/core/src/test/java/io/cucumber/core/options/CucumberPropertiesParserTest.java
+++ b/core/src/test/java/io/cucumber/core/options/CucumberPropertiesParserTest.java
@@ -132,9 +132,9 @@ void should_parse_object_factory() {
 
     @Test
     void should_parse_plugin() {
-        properties.put(Constants.PLUGIN_PROPERTY_NAME, "json:target/cucumber.json, html:target/cucumber.html");
+        properties.put(Constants.PLUGIN_PROPERTY_NAME, "message:target/cucumber.ndjson, html:target/cucumber.html");
         RuntimeOptions options = cucumberPropertiesParser.parse(properties).build();
-        assertThat(options.plugins().get(0).pluginString(), equalTo("json:target/cucumber.json"));
+        assertThat(options.plugins().get(0).pluginString(), equalTo("message:target/cucumber.ndjson"));
         assertThat(options.plugins().get(1).pluginString(), equalTo("html:target/cucumber.html"));
     }
 
diff --git a/core/src/test/java/io/cucumber/core/options/RuntimeOptionsTest.java b/core/src/test/java/io/cucumber/core/options/RuntimeOptionsTest.java
index 755087f8f0..c6bd9ea4ad 100644
--- a/core/src/test/java/io/cucumber/core/options/RuntimeOptionsTest.java
+++ b/core/src/test/java/io/cucumber/core/options/RuntimeOptionsTest.java
@@ -160,7 +160,7 @@ void creates_html_formatter() {
         Plugins plugins = new Plugins(new PluginFactory(), options);
         plugins.setEventBusOnEventListenerPlugins(new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID));
 
-        assertThat(plugins.getPlugins().get(0).getClass().getName(), is("io.cucumber.core.plugin.HTMLFormatter"));
+        assertThat(plugins.getPlugins().get(0).getClass().getName(), is("io.cucumber.core.plugin.HtmlFormatter"));
     }
 
     @Test
@@ -498,7 +498,7 @@ void adds_to_formatter_plugins_with_add_plugin_option() {
         plugins.setEventBusOnEventListenerPlugins(new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID));
 
         assertAll("Checking Plugins",
-            () -> assertThat(plugins.getPlugins(), hasItem(plugin("io.cucumber.core.plugin.HTMLFormatter"))),
+            () -> assertThat(plugins.getPlugins(), hasItem(plugin("io.cucumber.core.plugin.HtmlFormatter"))),
             () -> assertThat(plugins.getPlugins(), hasItem(plugin("io.cucumber.core.plugin.PrettyFormatter")))
         );
     }
diff --git a/core/src/test/java/io/cucumber/core/plugin/CanonicalEventOrderTest.java b/core/src/test/java/io/cucumber/core/plugin/CanonicalEventOrderTest.java
index 2455d37a5f..78acc4fe71 100644
--- a/core/src/test/java/io/cucumber/core/plugin/CanonicalEventOrderTest.java
+++ b/core/src/test/java/io/cucumber/core/plugin/CanonicalEventOrderTest.java
@@ -14,6 +14,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/core/src/test/java/io/cucumber/core/plugin/FormatterBuilder.java b/core/src/test/java/io/cucumber/core/plugin/FormatterBuilder.java
deleted file mode 100644
index e3db441bd1..0000000000
--- a/core/src/test/java/io/cucumber/core/plugin/FormatterBuilder.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package io.cucumber.core.plugin;
-
-public class FormatterBuilder {
-
-    public static JSONFormatter jsonFormatter(Appendable out) {
-        return new JSONFormatter(out);
-    }
-}
diff --git a/core/src/test/java/io/cucumber/core/plugin/HTMLFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/HTMLFormatterTest.java
deleted file mode 100644
index 269c0edf95..0000000000
--- a/core/src/test/java/io/cucumber/core/plugin/HTMLFormatterTest.java
+++ /dev/null
@@ -1,785 +0,0 @@
-package io.cucumber.core.plugin;
-
-import gherkin.deps.com.google.gson.JsonParser;
-import io.cucumber.plugin.event.Result;
-import io.cucumber.core.gherkin.Feature;
-import io.cucumber.core.feature.TestFeatureParser;
-import io.cucumber.core.runner.TestHelper;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.nodes.Element;
-import org.junit.jupiter.api.Test;
-import org.mockito.stubbing.Answer;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.time.Duration;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
-import static io.cucumber.core.runner.TestHelper.createEmbedHookAction;
-import static io.cucumber.core.runner.TestHelper.createWriteHookAction;
-import static io.cucumber.core.runner.TestHelper.result;
-import static java.nio.charset.StandardCharsets.US_ASCII;
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.time.Duration.ofMillis;
-import static java.util.Arrays.asList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.fail;
-
-class HTMLFormatterTest {
-
-    private final static String jsFunctionCallRegexString = "formatter.(\\w*)\\(([^)]*)\\);";
-    private final static Pattern jsFunctionCallRegex = Pattern.compile(jsFunctionCallRegexString);
-
-    private final List<Feature> features = new ArrayList<>();
-    private final Map<String, Result> stepsToResult = new HashMap<>();
-    private final Map<String, String> stepsToLocation = new HashMap<>();
-    private final List<SimpleEntry<String, Result>> hooks = new ArrayList<>();
-    private final List<String> hookLocations = new ArrayList<>();
-    private final List<Answer<Object>> hookActions = new ArrayList<>();
-    private Duration stepDuration = null;
-
-    private URL outputDir;
-
-    private void writeReport() throws Throwable {
-        outputDir = TempDir.createTempDirectory().toURI().toURL();
-        runFeaturesWithFormatter(outputDir);
-    }
-
-    @Test
-    void writes_index_html() throws Throwable {
-        writeReport();
-        URL indexHtml = new URL(outputDir, "index.html");
-        Document document = Jsoup.parse(new File(indexHtml.getFile()), UTF_8.name());
-        Element reportElement = document.body().getElementsByClass("cucumber-report").first();
-        assertThat(reportElement.text(), is(equalTo("")));
-    }
-
-    @Test
-    void writes_valid_report_js() throws Throwable {
-        writeReport();
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.uri(\"file:some/path/some.feature\");\n",
-            "formatter.feature({\n" +
-                "  \"name\": \"\",\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Feature\"\n" +
-                "});\n",
-            "formatter.scenario({\n" +
-                "  \"name\": \"some cukes\",\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\"\n" +
-                "});\n",
-            "formatter.step({\n" +
-                "  \"name\": \"first step\",\n" +
-                "  \"keyword\": \"Given \"\n" +
-                "});\n",
-            "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n",
-            "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n",
-            "formatter.embedding(\"text/plain\", \"dodgy stack trace here\", null);\n",
-            "formatter.after({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n",
-            "formatter.embedding(\"image/png\", \"embedded0.png\", \"Fake image\");\n",
-            "formatter.after({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"
-
-            ),
-            readReportJs());
-    }
-
-    @Test
-    void includes_uri() throws Throwable {
-        writeReport();
-        assertContains("formatter.uri(\"file:some/path/some.feature\");", readReportJs());
-    }
-
-    @Test
-    void included_embedding() throws Throwable {
-        writeReport();
-        String reportJs = readReportJs();
-        assertAll("Checking ReportJs",
-            () -> assertContains("formatter.embedding(\"image/png\", \"embedded0.png\", \"Fake image\");", reportJs),
-            () -> assertContains("formatter.embedding(\"text/plain\", \"dodgy stack trace here\", null);", reportJs)
-        );
-    }
-
-    @Test
-    void should_handle_a_single_scenario() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario: scenario name\n" +
-            "    Given first step\n" +
-            "    Then second step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToResult.put("second step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        stepsToLocation.put("second step", "path/step_definitions.java:7");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.uri(\"file:path/test.feature\");\n", "" +
-                "formatter.feature({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"name\": \"feature name\",\n" +
-                "  \"keyword\": \"Feature\"\n" +
-                "});\n", "" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Then \",\n" +
-                "  \"name\": \"second step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:7\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_backgound() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Background: background name\n" +
-            "    Given first step\n" +
-            "  Scenario: scenario 1\n" +
-            "    Then second step\n" +
-            "  Scenario: scenario 2\n" +
-            "    Then third step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToResult.put("second step", result("passed"));
-        stepsToResult.put("third step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        stepsToLocation.put("second step", "path/step_definitions.java:7");
-        stepsToLocation.put("third step", "path/step_definitions.java:11");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.background({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Background\",\n" +
-                "  \"name\": \"background name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario 1\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Then \",\n" +
-                "  \"name\": \"second step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:7\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.background({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Background\",\n" +
-                "  \"name\": \"background name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario 2\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Then \",\n" +
-                "  \"name\": \"third step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:11\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_scenario_outline() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario Outline: outline name\n" +
-            "    Given first step\n" +
-            "    Then <arg> step\n" +
-            "    Examples: examples name\n" +
-            "      |  arg   |\n" +
-            "      | second |\n" +
-            "      | third  |\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToResult.put("second step", result("passed"));
-        stepsToResult.put("third step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        stepsToLocation.put("second step", "path/step_definitions.java:7");
-        stepsToLocation.put("third step", "path/step_definitions.java:11");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.uri(\"file:path/test.feature\");\n", "" +
-                "formatter.feature({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"name\": \"feature name\",\n" +
-                "  \"keyword\": \"Feature\"\n" +
-                "});\n", "" +
-                "formatter.scenarioOutline({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario Outline\",\n" +
-                "  \"name\": \"outline name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Then \",\n" +
-                "  \"name\": \"\\u003carg\\u003e step\"\n" +
-                "});\n", "" +
-                "formatter.examples({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Examples\",\n" +
-                "  \"name\": \"examples name\",\n" +
-                "  \"rows\": [\n" +
-                "    {\n" +
-                "      \"cells\": [\n" +
-                "        \"arg\"\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"cells\": [\n" +
-                "        \"second\"\n" +
-                "      ]\n" +
-                "    },\n" +
-                "    {\n" +
-                "      \"cells\": [\n" +
-                "        \"third\"\n" +
-                "      ]\n" +
-                "    }\n" +
-                "  ]\n" +
-                "});\n", "" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario Outline\",\n" +
-                "  \"name\": \"outline name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Then \",\n" +
-                "  \"name\": \"second step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:7\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario Outline\",\n" +
-                "  \"name\": \"outline name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Then \",\n" +
-                "  \"name\": \"third step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:11\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_before_hooks() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario: scenario name\n" +
-            "    Given first step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        hooks.add(TestHelper.hookEntry("before", result("passed")));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario name\"\n" +
-                "});\n", "" +
-                "formatter.before({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_after_hooks() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario: scenario name\n" +
-            "    Given first step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        hooks.add(TestHelper.hookEntry("after", result("passed")));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.after({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_after_step_hooks() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario: scenario name\n" +
-            "    Given first step\n" +
-            "    When second step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToResult.put("second step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        stepsToLocation.put("second step", "path/step_definitions.java:4");
-        hooks.add(TestHelper.hookEntry("afterstep", result("passed")));
-        hooks.add(TestHelper.hookEntry("afterstep", result("passed")));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.afterstep({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.afterstep({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"When \",\n" +
-                "  \"name\": \"second step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:4\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.afterstep({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.afterstep({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_output_from_before_hooks() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario: scenario name\n" +
-            "    Given first step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        hooks.add(TestHelper.hookEntry("before", result("passed")));
-        hookActions.add(createWriteHookAction("printed from hook"));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario name\"\n" +
-                "});\n", "" +
-                "formatter.write(\"printed from hook\");\n", "" +
-                "formatter.before({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_output_from_after_hooks() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario: scenario name\n" +
-            "    Given first step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        hooks.add(TestHelper.hookEntry("after", result("passed")));
-        hookActions.add(createWriteHookAction("printed from hook"));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.write(\"printed from hook\");\n", "" +
-                "formatter.after({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_output_from_after_step_hooks() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario: scenario name\n" +
-            "    Given first step\n" +
-            "    When second step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToResult.put("second step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        stepsToLocation.put("second step", "path/step_definitions.java:4");
-        hooks.add(TestHelper.hookEntry("afterstep", result("passed")));
-        hookActions.add(createWriteHookAction("printed from hook"));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario name\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.write(\"printed from hook\");\n", "" +
-                "formatter.afterstep({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"When \",\n" +
-                "  \"name\": \"second step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:4\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.write(\"printed from hook\");\n", "" +
-                "formatter.afterstep({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"),
-            formatterOutput);
-    }
-
-    @Test
-    void should_handle_text_embeddings_from_before_hooks() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: feature name\n" +
-            "  Scenario: scenario name\n" +
-            "    Given first step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        hooks.add(TestHelper.hookEntry("before", result("passed")));
-        hookActions.add(createEmbedHookAction("embedded from hook".getBytes(US_ASCII), "text/ascii"));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        assertJsFunctionCallSequence(asList("" +
-                "formatter.scenario({\n" +
-                "  \"description\": \"\",\n" +
-                "  \"keyword\": \"Scenario\",\n" +
-                "  \"name\": \"scenario name\"\n" +
-                "});\n", "" +
-                "formatter.embedding(\"text/ascii\", \"embedded from hook\", null);\n", "" +
-                "formatter.before({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n", "" +
-                "formatter.step({\n" +
-                "  \"keyword\": \"Given \",\n" +
-                "  \"name\": \"first step\"\n" +
-                "});\n", "" +
-                "formatter.match({\n" +
-                "  \"location\": \"path/step_definitions.java:3\"\n" +
-                "});\n", "" +
-                "formatter.result({\n" +
-                "  \"status\": \"passed\"\n" +
-                "});\n"),
-            formatterOutput);
-    }
-
-    private String readReportJs() throws IOException {
-        InputStream reportJsStream = new URL(outputDir, "report.js").openStream();
-        try (BufferedReader br = new BufferedReader(new InputStreamReader(reportJsStream, UTF_8))) {
-            return br.lines().collect(Collectors.joining(System.lineSeparator()));
-        }
-    }
-
-    private void assertJsFunctionCallSequence(List<String> expectedList, String actual) {
-        Iterator<String> expectedIterator = expectedList.iterator();
-        String expected = expectedIterator.next();
-        Matcher expectedMatcher = jsFunctionCallRegex.matcher(expected);
-        Matcher actualMatcher = jsFunctionCallRegex.matcher(actual);
-        assertThat(jsFunctionCallMatchFailure(expected), expectedMatcher.find(), is(equalTo(true)));
-        boolean found = false;
-        while (actualMatcher.find()) {
-            if (matchFound(expectedMatcher, actualMatcher)) {
-                found = true;
-                break;
-            }
-        }
-        assertThat(jsFunctionCallNotFoundMessage(actual, expected), found, is(equalTo(true)));
-        while (expectedIterator.hasNext()) {
-            expected = expectedIterator.next();
-            expectedMatcher = jsFunctionCallRegex.matcher(expected);
-            assertThat(jsFunctionCallMatchFailure(expected), expectedMatcher.find(), is(equalTo(true)));
-            assertThat(jsFunctionCallNotFoundMessage(actual, expected), actualMatcher.find(), is(equalTo(true)));
-            if (!matchFound(expectedMatcher, actualMatcher)) {
-                fail(jsFunctionCallNotFoundMessage(actual, expected));
-            }
-        }
-    }
-
-    private String jsFunctionCallMatchFailure(String expected) {
-        return "The expected string: " + expected + ", does not match " + jsFunctionCallRegexString;
-    }
-
-    private String jsFunctionCallNotFoundMessage(String actual, String expected) {
-        return "The expected js function call: " + expected + ", is not found in " + actual;
-    }
-
-    private boolean matchFound(Matcher expectedMatcher, Matcher actualMatcher) {
-        String expectedFunction = expectedMatcher.group(1);
-        String actualFunction = actualMatcher.group(1);
-        if (!expectedFunction.equals(actualFunction)) {
-            return false;
-        }
-        String expectedArgument = expectedMatcher.group(2);
-        String actualArgumant = actualMatcher.group(2);
-        if (matchUsingJson(expectedArgument, actualArgumant)) {
-            JsonParser parser = new JsonParser();
-            return parser.parse(expectedArgument).equals(parser.parse(actualArgumant));
-        } else {
-            return expectedArgument.equals(actualArgumant);
-        }
-    }
-
-    private boolean matchUsingJson(String expected, String actual) {
-        return expected.startsWith("{") && actual.startsWith("{");
-    }
-
-    private void assertContains(String substring, String string) {
-        if (!string.contains(substring)) {
-            fail(String.format("[%s] not contained in [%s]", substring, string));
-        }
-    }
-
-    private void runFeaturesWithFormatter(URL outputDir) {
-        final HTMLFormatter f = new HTMLFormatter(outputDir);
-        Feature feature = TestFeatureParser.parse("some/path/some.feature", "" +
-            "Feature:\n" +
-            "  Scenario: some cukes\n" +
-            "    Given first step\n");
-        features.add(feature);
-        stepsToResult.put("first step", result("passed"));
-        stepsToLocation.put("first step", "path/step_definitions.java:3");
-        hooks.add(TestHelper.hookEntry("after", result("passed")));
-        hooks.add(TestHelper.hookEntry("after", result("passed")));
-        hookActions.add(createEmbedHookAction("fakedata".getBytes(US_ASCII), "image/png", "Fake image"));
-        hookActions.add(createEmbedHookAction("dodgy stack trace here".getBytes(US_ASCII), "text/plain"));
-        stepDuration = ofMillis(1L);
-
-        runFeaturesWithFormatter(f);
-    }
-
-    private String runFeaturesWithFormatter() {
-        final StringBuilder report = new StringBuilder();
-        final HTMLFormatter formatter = new HTMLFormatter(null, new NiceAppendable(report));
-        runFeaturesWithFormatter(formatter);
-        return report.toString();
-    }
-
-    private void runFeaturesWithFormatter(HTMLFormatter formatter) {
-        TestHelper.builder()
-            .withFormatterUnderTest(formatter)
-            .withFeatures(features)
-            .withStepsToResult(stepsToResult)
-            .withStepsToLocation(stepsToLocation)
-            .withHooks(hooks)
-            .withHookLocations(hookLocations)
-            .withHookActions(hookActions)
-            .withTimeServiceIncrement(stepDuration)
-            .build()
-            .run();
-    }
-
-}
diff --git a/core/src/test/java/io/cucumber/core/plugin/HtmlFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/HtmlFormatterTest.java
new file mode 100644
index 0000000000..f30f62db78
--- /dev/null
+++ b/core/src/test/java/io/cucumber/core/plugin/HtmlFormatterTest.java
@@ -0,0 +1,51 @@
+package io.cucumber.core.plugin;
+
+import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.core.runtime.TimeServiceEventBus;
+import io.cucumber.messages.Messages;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.time.Clock;
+import java.util.UUID;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+class HtmlFormatterTest {
+
+    @Test
+    void writes_index_html() throws Throwable {
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        HtmlFormatter formatter = new HtmlFormatter(bytes);
+        EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+        formatter.setEventPublisher(bus);
+
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestRunStarted(Messages.TestRunStarted.newBuilder()
+                .setTimestamp(Messages.Timestamp.newBuilder()
+                    .setSeconds(10)
+                    .build())
+                .build())
+            .build());
+
+        bus.send(
+            Messages.Envelope.newBuilder()
+                .setTestRunFinished(Messages.TestRunFinished.newBuilder()
+                    .setTimestamp(Messages.Timestamp.newBuilder()
+                        .setSeconds(15)
+                        .build())
+                    .build())
+                .build());
+
+        String html = new String(bytes.toByteArray(), UTF_8);
+        assertThat(html, containsString("" +
+            "window.CUCUMBER_MESSAGES = [" +
+            "{\"testRunStarted\":{\"timestamp\":{\"seconds\":\"10\"}}}," +
+            "{\"testRunFinished\":{\"timestamp\":{\"seconds\":\"15\"}}}" +
+            "];"));
+    }
+
+
+}
diff --git a/core/src/test/java/io/cucumber/core/plugin/JSONFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/JSONFormatterTest.java
deleted file mode 100755
index 5c2dc84e88..0000000000
--- a/core/src/test/java/io/cucumber/core/plugin/JSONFormatterTest.java
+++ /dev/null
@@ -1,1316 +0,0 @@
-package io.cucumber.core.plugin;
-
-import io.cucumber.core.backend.Glue;
-import io.cucumber.core.backend.HookDefinition;
-import io.cucumber.core.eventbus.EventBus;
-import io.cucumber.core.gherkin.Feature;
-import io.cucumber.core.feature.TestFeatureParser;
-import io.cucumber.core.options.CommandlineOptionsParser;
-import io.cucumber.core.options.RuntimeOptions;
-import io.cucumber.core.runner.ClockStub;
-import io.cucumber.core.runner.TestBackendSupplier;
-import io.cucumber.core.runner.TestHelper;
-import io.cucumber.core.runtime.Runtime;
-import io.cucumber.core.runtime.TimeServiceEventBus;
-import io.cucumber.plugin.event.Result;
-import org.junit.jupiter.api.Test;
-import org.mockito.stubbing.Answer;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.time.Duration;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Scanner;
-import java.util.UUID;
-
-import static io.cucumber.core.runner.TestHelper.createEmbedHookAction;
-import static io.cucumber.core.runner.TestHelper.createWriteHookAction;
-import static io.cucumber.core.runner.TestHelper.result;
-import static java.time.Duration.ofMillis;
-import static java.util.Collections.singletonList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
-
-class JSONFormatterTest {
-
-    private final List<Feature> features = new ArrayList<>();
-    private final Map<String, Result> stepsToResult = new HashMap<>();
-    private final Map<String, String> stepsToLocation = new HashMap<>();
-    private final List<SimpleEntry<String, Result>> hooks = new ArrayList<>();
-    private final List<String> hookLocations = new ArrayList<>();
-    private final List<Answer<Object>> hookActions = new ArrayList<>();
-    private Duration stepDuration = Duration.ZERO;
-
-    @Test
-    void featureWithOutlineTest() {
-        List<String> featurePaths = singletonList("classpath:io/cucumber/core/plugin/JSONPrettyFormatterTest.feature");
-        String actual = runFeaturesWithFormatter(featurePaths);
-        InputStream resourceAsStream = getClass().getResourceAsStream("JSONPrettyFormatterTest.json");
-        String expected = new Scanner(resourceAsStream, "UTF-8")
-            .useDelimiter("\\A")
-            .next();
-        assertThat(actual, sameJSONAs(expected));
-    }
-
-    @Test
-    void featureWithOutlineTestParallel() throws Exception {
-        List<String> featurePaths = singletonList("classpath:io/cucumber/core/plugin/JSONPrettyFormatterTest.feature");
-        String actual = runFeaturesWithFormatterInParallel(featurePaths);
-        InputStream resourceAsStream = getClass().getResourceAsStream("JSONPrettyFormatterTest.json");
-        String expected = new Scanner(resourceAsStream, "UTF-8")
-            .useDelimiter("\\A")
-            .next();
-
-        assertThat(actual, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_scenario_with_an_undefined_step() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("undefined"));
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {},\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"undefined\"\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_scenario_with_a_passed_step() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_scenario_with_a_failed_step() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("failed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"failed\",\n" +
-            "              \"error_message\": \"the stack trace\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_scenario_outline_with_one_example() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Fruit party\n" +
-            "\n" +
-            "  Scenario Outline: Monkey eats fruits\n" +
-            "    Given there are <fruits>\n" +
-            "      Examples: Fruit table\n" +
-            "      | fruits  |\n" +
-            "      | bananas |\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"fruit-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Fruit party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"fruit-party;monkey-eats-fruits;fruit-table;2\",\n" +
-            "        \"keyword\": \"Scenario Outline\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats fruits\",\n" +
-            "        \"line\": 7,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_feature_with_background() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Background: There are bananas\n" +
-            "    Given there are bananas\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Then the monkey eats bananas\n" +
-            "\n" +
-            "  Scenario: Monkey eats more bananas\n" +
-            "    Then the monkey eats more bananas\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToResult.put("the monkey eats bananas", result("passed"));
-        stepsToResult.put("the monkey eats more bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepsToLocation.put("the monkey eats bananas", "StepDefs.monkey_eats_bananas()");
-        stepsToLocation.put("the monkey eats more bananas", "StepDefs.monkey_eats_more_bananas()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"keyword\": \"Background\",\n" +
-            "        \"name\": \"There are bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"background\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      },\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 6,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Then \",\n" +
-            "            \"name\": \"the monkey eats bananas\",\n" +
-            "            \"line\": 7,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.monkey_eats_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      },\n" +
-            "      {\n" +
-            "        \"keyword\": \"Background\",\n" +
-            "        \"name\": \"There are bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"background\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      },\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-more-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.002Z\",\n" +
-            "        \"name\": \"Monkey eats more bananas\",\n" +
-            "        \"line\": 9,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Then \",\n" +
-            "            \"name\": \"the monkey eats more bananas\",\n" +
-            "            \"line\": 10,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.monkey_eats_more_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_feature_and_scenario_with_tags() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "@Party @Banana\n" +
-            "Feature: Banana party\n" +
-            "  @Monkey\n" +
-            "  Scenario: Monkey eats more bananas\n" +
-            "    Then the monkey eats more bananas\n");
-        features.add(feature);
-        stepsToResult.put("the monkey eats more bananas", result("passed"));
-        stepsToLocation.put("the monkey eats more bananas", "StepDefs.monkey_eats_more_bananas()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"line\": 2,\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"line\": 4,\n" +
-            "        \"name\": \"Monkey eats more bananas\",\n" +
-            "        \"description\": \"\",\n" +
-            "        \"id\": \"banana-party;monkey-eats-more-bananas\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"result\": {\n" +
-            "              \"duration\": 1000000,\n" +
-            "              \"status\": \"passed\"\n" +
-            "            },\n" +
-            "            \"line\": 5,\n" +
-            "            \"name\": \"the monkey eats more bananas\",\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.monkey_eats_more_bananas()\"\n" +
-            "            },\n" +
-            "            \"keyword\": \"Then \"\n" +
-            "          }\n" +
-            "        ],\n" +
-            "        \"tags\": [\n" +
-            "          {\n" +
-            "            \"name\": \"@Party\"\n" +
-            "          },\n" +
-            "          {\n" +
-            "            \"name\": \"@Banana\"\n" +
-            "          },\n" +
-            "          {\n" +
-            "            \"name\": \"@Monkey\"\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"description\": \"\",\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"tags\": [\n" +
-            "      {\n" +
-            "        \"name\": \"@Party\",\n" +
-            "        \"type\": \"Tag\",\n" +
-            "        \"location\": {\n" +
-            "          \"line\": 1,\n" +
-            "          \"column\": 1\n" +
-            "        }\n" +
-            "      },\n" +
-            "      {\n" +
-            "        \"name\": \"@Banana\",\n" +
-            "        \"type\": \"Tag\",\n" +
-            "        \"location\": {\n" +
-            "          \"line\": 1,\n" +
-            "          \"column\": 8\n" +
-            "        }\n" +
-            "      }\n" +
-            "    ]\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_scenario_with_hooks() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        hooks.add(TestHelper.hookEntry("before", result("passed")));
-        hooks.add(TestHelper.hookEntry("after", result("passed")));
-        hookLocations.add("Hooks.before_hook_1()");
-        hookLocations.add("Hooks.after_hook_1()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"before\": [\n" +
-            "          {\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"Hooks.before_hook_1()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ],\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ],\n" +
-            "        \"after\": [\n" +
-            "          {\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"Hooks.after_hook_1()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_add_step_hooks_to_step() {
-        Feature feature = TestFeatureParser.parse("file:path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n" +
-            "    When monkey arrives\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToResult.put("monkey arrives", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepsToLocation.put("monkey arrives", "StepDefs.monkey_arrives()");
-        hooks.add(TestHelper.hookEntry("beforestep", result("passed")));
-        hooks.add(TestHelper.hookEntry("afterstep", result("passed")));
-        hooks.add(TestHelper.hookEntry("afterstep", result("passed")));
-        hookLocations.add("Hooks.beforestep_hooks_1()");
-        hookLocations.add("Hooks.afterstep_hooks_1()");
-        hookLocations.add("Hooks.afterstep_hooks_2()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"line\": 1,\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"line\": 3,\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"description\": \"\",\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"result\": {\n" +
-            "              \"duration\": 1000000,\n" +
-            "              \"status\": \"passed\"\n" +
-            "            },\n" +
-            "            \"before\": [\n" +
-            "              {\n" +
-            "                \"result\": {\n" +
-            "                  \"duration\": 1000000,\n" +
-            "                  \"status\": \"passed\"\n" +
-            "                },\n" +
-            "                \"match\": {\n" +
-            "                  \"location\": \"Hooks.beforestep_hooks_1()\"\n" +
-            "                }\n" +
-            "              }\n" +
-            "            ],\n" +
-            "            \"line\": 4,\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"after\": [\n" +
-            "              {\n" +
-            "                \"result\": {\n" +
-            "                  \"duration\": 1000000,\n" +
-            "                  \"status\": \"passed\"\n" +
-            "                },\n" +
-            "                \"match\": {\n" +
-            "                  \"location\": \"Hooks.afterstep_hooks_2()\"\n" +
-            "                }\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"result\": {\n" +
-            "                  \"duration\": 1000000,\n" +
-            "                  \"status\": \"passed\"\n" +
-            "                },\n" +
-            "                \"match\": {\n" +
-            "                  \"location\": \"Hooks.afterstep_hooks_1()\"\n" +
-            "                }\n" +
-            "              }\n" +
-            "            ],\n" +
-            "            \"keyword\": \"Given \"\n" +
-            "          },\n" +
-            "          {\n" +
-            "            \"result\": {\n" +
-            "              \"duration\": 1000000,\n" +
-            "              \"status\": \"passed\"\n" +
-            "            },\n" +
-            "            \"before\": [\n" +
-            "              {\n" +
-            "                \"result\": {\n" +
-            "                  \"duration\": 1000000,\n" +
-            "                  \"status\": \"passed\"\n" +
-            "                },\n" +
-            "                \"match\": {\n" +
-            "                  \"location\": \"Hooks.beforestep_hooks_1()\"\n" +
-            "                }\n" +
-            "              }\n" +
-            "            ],\n" +
-            "            \"line\": 5,\n" +
-            "            \"name\": \"monkey arrives\",\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.monkey_arrives()\"\n" +
-            "            },\n" +
-            "            \"after\": [\n" +
-            "              {\n" +
-            "                \"result\": {\n" +
-            "                  \"duration\": 1000000,\n" +
-            "                  \"status\": \"passed\"\n" +
-            "                },\n" +
-            "                \"match\": {\n" +
-            "                  \"location\": \"Hooks.afterstep_hooks_2()\"\n" +
-            "                }\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"result\": {\n" +
-            "                  \"duration\": 1000000,\n" +
-            "                  \"status\": \"passed\"\n" +
-            "                },\n" +
-            "                \"match\": {\n" +
-            "                  \"location\": \"Hooks.afterstep_hooks_1()\"\n" +
-            "                }\n" +
-            "              }\n" +
-            "            ],\n" +
-            "            \"keyword\": \"When \"\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"description\": \"\",\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_handle_write_from_a_hook() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        hooks.add(TestHelper.hookEntry("before", result("passed")));
-        hookLocations.add("Hooks.before_hook_1()");
-        hookActions.add(createWriteHookAction("printed from hook"));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"before\": [\n" +
-            "          {\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"Hooks.before_hook_1()\"\n" +
-            "            },\n" +
-            "            \"output\": [\n" +
-            "              \"printed from hook\"\n" +
-            "            ],\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ],\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_handle_embed_from_a_hook() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        hooks.add(TestHelper.hookEntry("before", result("passed")));
-        hookLocations.add("Hooks.before_hook_1()");
-        hookActions.add(createEmbedHookAction(new byte[]{1, 2, 3}, "mime-type;base64"));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"before\": [\n" +
-            "          {\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"Hooks.before_hook_1()\"\n" +
-            "            },\n" +
-            "            \"embeddings\": [\n" +
-            "              {\n" +
-            "                \"mime_type\": \"mime-type;base64\",\n" +
-            "                \"data\": \"AQID\"\n" +
-            "              }\n" +
-            "            ],\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ],\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_handle_embed_with_name_from_a_hook() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        hooks.add(TestHelper.hookEntry("before", result("passed")));
-        hookLocations.add("Hooks.before_hook_1()");
-        hookActions.add(createEmbedHookAction(new byte[]{1, 2, 3}, "mime-type;base64", "someEmbedding"));
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"before\": [\n" +
-            "          {\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"Hooks.before_hook_1()\"\n" +
-            "            },\n" +
-            "            \"embeddings\": [\n" +
-            "              {\n" +
-            "                \"mime_type\": \"mime-type;base64\",\n" +
-            "                \"data\": \"AQID\",\n" +
-            "                \"name\": \"someEmbedding\"\n" +
-            "              }\n" +
-            "            ],\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ],\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_scenario_with_a_step_with_a_doc_string() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n" +
-            "    \"\"\"\n" +
-            "    doc string content\n" +
-            "    \"\"\"\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"doc_string\": {\n" +
-            "              \"value\": \"doc string content\",\n" +
-            "              \"line\": 5\n" +
-            "            },\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_scenario_with_a_step_with_a_doc_string_and_content_type() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n" +
-            "    \"\"\"doc\n" +
-            "    doc string content\n" +
-            "    \"\"\"\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"doc_string\": {\n" +
-            "              \"content_type\": \"doc\",\n" +
-            "              \"value\": \"doc string content\",\n" +
-            "              \"line\": 5\n" +
-            "            },\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_format_scenario_with_a_step_with_a_data_table() {
-        Feature feature = TestFeatureParser.parse("path/test.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n" +
-            "      | aa | 11 |\n" +
-            "      | bb | 22 |\n");
-        features.add(feature);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"rows\": [\n" +
-            "              {\n" +
-            "                \"cells\": [\n" +
-            "                  \"aa\",\n" +
-            "                  \"11\"\n" +
-            "                ]\n" +
-            "              },\n" +
-            "              {\n" +
-            "                \"cells\": [\n" +
-            "                  \"bb\",\n" +
-            "                  \"22\"\n" +
-            "                ]\n" +
-            "              }\n" +
-            "            ],\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    @Test
-    void should_handle_several_features() {
-        Feature feature1 = TestFeatureParser.parse("path/test1.feature", "" +
-            "Feature: Banana party\n" +
-            "\n" +
-            "  Scenario: Monkey eats bananas\n" +
-            "    Given there are bananas\n");
-        Feature feature2 = TestFeatureParser.parse("path/test2.feature", "" +
-            "Feature: Orange party\n" +
-            "\n" +
-            "  Scenario: Monkey eats oranges\n" +
-            "    Given there are oranges\n");
-        features.add(feature1);
-        features.add(feature2);
-        stepsToResult.put("there are bananas", result("passed"));
-        stepsToResult.put("there are oranges", result("passed"));
-        stepsToLocation.put("there are bananas", "StepDefs.there_are_bananas()");
-        stepsToLocation.put("there are oranges", "StepDefs.there_are_oranges()");
-        stepDuration = ofMillis(1L);
-
-        String formatterOutput = runFeaturesWithFormatter();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"id\": \"banana-party\",\n" +
-            "    \"uri\": \"file:path/test1.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Banana party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"banana-party;monkey-eats-bananas\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"name\": \"Monkey eats bananas\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are bananas\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_bananas()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  },\n" +
-            "  {\n" +
-            "    \"id\": \"orange-party\",\n" +
-            "    \"uri\": \"file:path/test2.feature\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"name\": \"Orange party\",\n" +
-            "    \"line\": 1,\n" +
-            "    \"description\": \"\",\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"id\": \"orange-party;monkey-eats-oranges\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.001Z\",\n" +
-            "        \"name\": \"Monkey eats oranges\",\n" +
-            "        \"line\": 3,\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"keyword\": \"Given \",\n" +
-            "            \"name\": \"there are oranges\",\n" +
-            "            \"line\": 4,\n" +
-            "            \"match\": {\n" +
-            "              \"location\": \"StepDefs.there_are_oranges()\"\n" +
-            "            },\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"passed\",\n" +
-            "              \"duration\": 1000000\n" +
-            "            }\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(formatterOutput, sameJSONAs(expected));
-    }
-
-    private String runFeaturesWithFormatterInParallel(final List<String> featurePaths) throws IOException {
-        final HookDefinition hook = mock(HookDefinition.class);
-        when(hook.getTagExpression()).thenReturn("");
-        File report = File.createTempFile("cucumber-jvm-junit", ".json");
-
-        List<String> args = new ArrayList<>();
-        args.add("--threads");
-        args.add("4");
-        args.add("--plugin");
-        args.add("json:" + report.getAbsolutePath());
-        args.addAll(featurePaths);
-
-        final TestBackendSupplier backendSupplier = new TestBackendSupplier() {
-            @Override
-            public void loadGlue(Glue glue, List<URI> gluePaths) {
-                glue.addBeforeHook(hook);
-
-            }
-        };
-        final EventBus bus = new TimeServiceEventBus(new ClockStub(ofMillis(1234L)), UUID::randomUUID);
-
-        Appendable stringBuilder = new StringBuilder();
-
-        RuntimeOptions runtimeOptions = RuntimeOptions.defaultOptions();
-        Runtime.builder()
-            .withRuntimeOptions(
-                new CommandlineOptionsParser()
-                    .parse(featurePaths)
-                    .build(runtimeOptions)
-            )
-            .withEventBus(bus)
-            .withBackendSupplier(backendSupplier)
-            .withAdditionalPlugins(new JSONFormatter(stringBuilder))
-            .build()
-            .run();
-
-        return stringBuilder.toString();
-    }
-
-
-    private String runFeaturesWithFormatter(final List<String> featurePaths) {
-        final HookDefinition hook = mock(HookDefinition.class);
-        when(hook.getTagExpression()).thenReturn("");
-
-        final TestBackendSupplier backendSupplier = new TestBackendSupplier() {
-            @Override
-            public void loadGlue(Glue glue, List<URI> gluePaths) {
-                glue.addBeforeHook(hook);
-
-            }
-        };
-        final EventBus bus = new TimeServiceEventBus(new ClockStub(ofMillis(1234L)), UUID::randomUUID);
-
-        Appendable stringBuilder = new StringBuilder();
-
-        Runtime.builder()
-            .withRuntimeOptions(
-                new CommandlineOptionsParser()
-                    .parse(featurePaths)
-                    .build()
-            )
-            .withEventBus(bus)
-            .withBackendSupplier(backendSupplier)
-            .withAdditionalPlugins(new JSONFormatter(stringBuilder))
-            .build()
-            .run();
-
-        return stringBuilder.toString();
-    }
-
-    private String runFeaturesWithFormatter() {
-        final StringBuilder report = new StringBuilder();
-
-        TestHelper.builder()
-            .withFormatterUnderTest(new JSONFormatter(report))
-            .withFeatures(features)
-            .withStepsToResult(stepsToResult)
-            .withStepsToLocation(stepsToLocation)
-            .withHooks(hooks)
-            .withHookLocations(hookLocations)
-            .withHookActions(hookActions)
-            .withTimeServiceIncrement(stepDuration)
-            .build()
-            .run();
-
-        return report.toString();
-    }
-
-}
diff --git a/core/src/test/java/io/cucumber/core/plugin/JUnitFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/JUnitFormatterTest.java
index f656eb83b0..560d6d0218 100644
--- a/core/src/test/java/io/cucumber/core/plugin/JUnitFormatterTest.java
+++ b/core/src/test/java/io/cucumber/core/plugin/JUnitFormatterTest.java
@@ -244,6 +244,7 @@ void should_handle_failure_in_before_hook() throws Throwable {
         stepsToResult.put("second step", result("passed"));
         stepsToResult.put("third step", result("passed"));
         hooks.add(TestHelper.hookEntry("before", result("failed")));
+        hookLocations.add("hook-location");
         stepDuration = Duration.ofMillis(1L);
 
         String formatterOutput = runFeaturesWithFormatter();
@@ -277,6 +278,7 @@ void should_handle_pending_in_before_hook() throws Throwable {
         stepsToResult.put("second step", result("skipped"));
         stepsToResult.put("third step", result("skipped"));
         hooks.add(TestHelper.hookEntry("before", result("pending")));
+        hookLocations.add("hook-location");
         stepDuration = Duration.ofMillis(1L);
 
         String formatterOutput = runFeaturesWithFormatter();
@@ -308,6 +310,7 @@ void should_handle_failure_in_before_hook_with_background() throws Throwable {
         stepsToResult.put("second step", result("passed"));
         stepsToResult.put("third step", result("passed"));
         hooks.add(TestHelper.hookEntry("before", result("failed")));
+        hookLocations.add("hook-location");
         stepDuration = Duration.ofMillis(1L);
 
         String formatterOutput = runFeaturesWithFormatter();
@@ -341,6 +344,7 @@ void should_handle_failure_in_after_hook() throws Throwable {
         stepsToResult.put("second step", result("passed"));
         stepsToResult.put("third step", result("passed"));
         hooks.add(TestHelper.hookEntry("after", result("failed")));
+        hookLocations.add("hook-location");
         stepDuration = Duration.ofMillis(1L);
 
         String formatterOutput = runFeaturesWithFormatter();
@@ -373,6 +377,8 @@ void should_accumulate_time_from_steps_and_hooks() throws Throwable {
         stepsToResult.put("second step", result("passed"));
         hooks.add(TestHelper.hookEntry("before", result("passed")));
         hooks.add(TestHelper.hookEntry("after", result("passed")));
+        hookLocations.add("hook-location-1");
+        hookLocations.add("hook-location-2");
         stepDuration = Duration.ofMillis(1L);
 
         String formatterOutput = runFeaturesWithFormatter();
diff --git a/core/src/test/java/io/cucumber/core/plugin/JsonParallelRuntimeTest.java b/core/src/test/java/io/cucumber/core/plugin/JsonParallelRuntimeTest.java
deleted file mode 100644
index 0e5f846cf6..0000000000
--- a/core/src/test/java/io/cucumber/core/plugin/JsonParallelRuntimeTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package io.cucumber.core.plugin;
-
-import io.cucumber.core.options.CommandlineOptionsParser;
-import io.cucumber.core.runner.ClockStub;
-import io.cucumber.core.runtime.Runtime;
-import io.cucumber.core.runtime.TimeServiceEventBus;
-import org.junit.jupiter.api.Test;
-
-import java.util.UUID;
-
-import static java.time.Duration.ZERO;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
-
-//TODO: Merge with the existing test
-class JsonParallelRuntimeTest {
-
-    @Test
-    void testSingleFeature() {
-        StringBuilder parallel = new StringBuilder();
-
-        Runtime.builder()
-            .withRuntimeOptions(
-                new CommandlineOptionsParser()
-                    .parse(
-                        "--threads", "3",
-                        "src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.feature")
-                    .build()
-            )
-            .withAdditionalPlugins(new JSONFormatter(parallel))
-            .withEventBus(new TimeServiceEventBus(new ClockStub(ZERO), UUID::randomUUID))
-            .build()
-            .run();
-
-        StringBuilder serial = new StringBuilder();
-
-        Runtime.builder()
-            .withRuntimeOptions(
-                new CommandlineOptionsParser()
-                    .parse(
-                        "--threads", "1",
-                        "src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.feature")
-                    .build()
-            )
-            .withAdditionalPlugins(new JSONFormatter(serial))
-            .withEventBus(new TimeServiceEventBus(new ClockStub(ZERO), UUID::randomUUID))
-            .build()
-            .run();
-
-        assertThat(parallel.toString(), sameJSONAs(serial.toString()).allowingAnyArrayOrdering());
-    }
-
-    @Test
-    void testMultipleFeatures() {
-        StringBuilder parallel = new StringBuilder();
-
-        Runtime.builder()
-            .withRuntimeOptions(
-                new CommandlineOptionsParser()
-                    .parse("--threads", "3",
-                        "src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.feature",
-                        "src/test/resources/io/cucumber/core/plugin/FormatterInParallel.feature")
-                    .build()
-            )
-            .withAdditionalPlugins(new JSONFormatter(parallel))
-            .withEventBus(new TimeServiceEventBus(new ClockStub(ZERO), UUID::randomUUID))
-            .build()
-            .run();
-
-
-        StringBuilder serial = new StringBuilder();
-
-        Runtime.builder()
-            .withRuntimeOptions(new CommandlineOptionsParser()
-                .parse("--threads", "1",
-                    "src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.feature",
-                    "src/test/resources/io/cucumber/core/plugin/FormatterInParallel.feature")
-                .build())
-            .withAdditionalPlugins(new JSONFormatter(serial))
-            .withEventBus(new TimeServiceEventBus(new ClockStub(ZERO), UUID::randomUUID))
-            .build()
-            .run();
-
-        assertThat(parallel.toString(), sameJSONAs(serial.toString()).allowingAnyArrayOrdering());
-    }
-
-}
diff --git a/core/src/test/java/io/cucumber/core/plugin/MessageFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/MessageFormatterTest.java
new file mode 100644
index 0000000000..3ef7a47aaf
--- /dev/null
+++ b/core/src/test/java/io/cucumber/core/plugin/MessageFormatterTest.java
@@ -0,0 +1,49 @@
+package io.cucumber.core.plugin;
+
+import io.cucumber.core.eventbus.EventBus;
+import io.cucumber.core.runtime.TimeServiceEventBus;
+import io.cucumber.messages.Messages;
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.time.Clock;
+import java.util.UUID;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class MessageFormatterTest {
+
+    @Test
+    void test() {
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        MessageFormatter formatter = new MessageFormatter(bytes);
+        EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
+        formatter.setEventPublisher(bus);
+
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestRunStarted(Messages.TestRunStarted.newBuilder()
+                .setTimestamp(Messages.Timestamp.newBuilder()
+                    .setSeconds(10)
+                    .build())
+                .build())
+            .build());
+
+        bus.send(
+            Messages.Envelope.newBuilder()
+                .setTestRunFinished(Messages.TestRunFinished.newBuilder()
+                    .setTimestamp(Messages.Timestamp.newBuilder()
+                        .setSeconds(15)
+                        .build())
+                    .build())
+                .build());
+
+        String html = new String(bytes.toByteArray(), UTF_8);
+        assertThat(html, containsString("" +
+            "{\"testRunStarted\":{\"timestamp\":{\"seconds\":\"10\"}}}\n" +
+            "{\"testRunFinished\":{\"timestamp\":{\"seconds\":\"15\"}}}"
+        ));
+    }
+}
diff --git a/core/src/test/java/io/cucumber/core/plugin/PickleStepMatcher.java b/core/src/test/java/io/cucumber/core/plugin/PickleStepMatcher.java
deleted file mode 100755
index 24860319a5..0000000000
--- a/core/src/test/java/io/cucumber/core/plugin/PickleStepMatcher.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.cucumber.core.plugin;
-
-import gherkin.pickles.PickleStep;
-
-import org.mockito.ArgumentMatcher;
-
-public class PickleStepMatcher implements ArgumentMatcher<PickleStep> {
-    private final String textToMatch;
-
-    public PickleStepMatcher(String text) {
-        this.textToMatch = text;
-    }
-
-    @Override
-    public boolean matches(PickleStep argument) {
-        return argument != null && (argument.getText().contains(textToMatch));
-    }
-}
diff --git a/core/src/test/java/io/cucumber/core/plugin/PluginFactoryTest.java b/core/src/test/java/io/cucumber/core/plugin/PluginFactoryTest.java
index 85abba0cf9..fa99dba5ff 100644
--- a/core/src/test/java/io/cucumber/core/plugin/PluginFactoryTest.java
+++ b/core/src/test/java/io/cucumber/core/plugin/PluginFactoryTest.java
@@ -44,9 +44,9 @@ void instantiates_junit_plugin_with_file_arg() throws IOException {
     }
 
     @Test
-     void instantiates_html_plugin_with_dir_arg() throws IOException {
-        Object plugin = fc.create(parse("html:" + TempDir.createTempDirectory().getAbsolutePath()));
-        assertThat(plugin.getClass(), is(equalTo(HTMLFormatter.class)));
+     void instantiates_html_plugin_with_file_arg() throws IOException {
+        Object plugin = fc.create(parse("html:" + File.createTempFile("cucumber", "html")));
+        assertThat(plugin.getClass(), is(equalTo(HtmlFormatter.class)));
     }
 
     @Test
diff --git a/core/src/test/java/io/cucumber/core/plugin/PrettyFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/PrettyFormatterTest.java
index 9d8f3567cb..409cb8a152 100755
--- a/core/src/test/java/io/cucumber/core/plugin/PrettyFormatterTest.java
+++ b/core/src/test/java/io/cucumber/core/plugin/PrettyFormatterTest.java
@@ -172,6 +172,7 @@ void should_print_error_message_for_before_hooks() {
         stepsToLocation.put("first step", "path/step_definitions.java:3");
         stepsToResult.put("first step", result("passed"));
         hooks.add(TestHelper.hookEntry("before", result("failed")));
+        hookLocations.add("hook-location");
 
         String formatterOutput = runFeaturesWithFormatter(true);
 
@@ -191,6 +192,7 @@ void should_print_error_message_for_after_hooks() {
         stepsToLocation.put("first step", "path/step_definitions.java:3");
         stepsToResult.put("first step", result("passed"));
         hooks.add(TestHelper.hookEntry("after", result("failed")));
+        hookLocations.add("hook-location");
 
         String formatterOutput = runFeaturesWithFormatter(true);
 
@@ -209,6 +211,7 @@ void should_print_output_from_before_hooks() {
         stepsToLocation.put("first step", "path/step_definitions.java:3");
         stepsToResult.put("first step", result("passed"));
         hooks.add(TestHelper.hookEntry("before", result("passed")));
+        hookLocations.add("hook-location");
         hookActions.add(createWriteHookAction("printed from hook"));
 
         String formatterOutput = runFeaturesWithFormatter(true);
@@ -231,6 +234,7 @@ void should_print_output_from_after_hooks() {
         stepsToLocation.put("first step", "path/step_definitions.java:3");
         stepsToResult.put("first step", result("passed"));
         hooks.add(TestHelper.hookEntry("after", result("passed")));
+        hookLocations.add("hook-location");
         hookActions.add(createWriteHookAction("printed from hook"));
 
         String formatterOutput = runFeaturesWithFormatter(true);
@@ -254,6 +258,7 @@ void should_print_output_from_afterStep_hooks() {
         stepsToResult.put("first step", result("passed"));
         stepsToResult.put("second step", result("passed"));
         hooks.add(TestHelper.hookEntry("afterstep", result("passed")));
+        hookLocations.add("hook-location");
         hookActions.add(createWriteHookAction("printed from afterstep hook"));
 
         String formatterOutput = runFeaturesWithFormatter(true);
diff --git a/core/src/test/java/io/cucumber/core/plugin/RerunFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/RerunFormatterTest.java
index 3aab99850f..caf79f1b15 100755
--- a/core/src/test/java/io/cucumber/core/plugin/RerunFormatterTest.java
+++ b/core/src/test/java/io/cucumber/core/plugin/RerunFormatterTest.java
@@ -22,6 +22,7 @@ class RerunFormatterTest {
     private final List<Feature> features = new ArrayList<>();
     private final Map<String, Result> stepsToResult = new HashMap<>();
     private final List<SimpleEntry<String, Result>> hooks = new ArrayList<>();
+    private final List<String> hookLocations = new ArrayList<>();
 
     @Test
     void should_leave_report_empty_when_exit_code_is_zero() {
@@ -134,6 +135,7 @@ void should_use_scenario_location_when_before_hook_fails() {
         stepsToResult.put("second step", result("passed"));
         stepsToResult.put("third step", result("passed"));
         hooks.add(TestHelper.hookEntry("before", result("failed")));
+        hookLocations.add("hook-location");
 
         String formatterOutput = runFeaturesWithFormatter(false);
 
@@ -153,6 +155,7 @@ void should_use_scenario_location_when_after_hook_fails() {
         stepsToResult.put("second step", result("passed"));
         stepsToResult.put("third step", result("passed"));
         hooks.add(TestHelper.hookEntry("after", result("failed")));
+        hookLocations.add("hook-location");
 
         String formatterOutput = runFeaturesWithFormatter(false);
 
@@ -214,6 +217,7 @@ private String runFeaturesWithFormatter(boolean isStrict) {
             .withFeatures(features)
             .withStepsToResult(stepsToResult)
             .withHooks(hooks)
+            .withHookLocations(hookLocations)
             .withTimeServiceIncrement(ZERO)
             .build()
             .run();
diff --git a/core/src/test/java/io/cucumber/core/plugin/TestNGFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/TestNGFormatterTest.java
index 27dfc1905a..55474a8eea 100644
--- a/core/src/test/java/io/cucumber/core/plugin/TestNGFormatterTest.java
+++ b/core/src/test/java/io/cucumber/core/plugin/TestNGFormatterTest.java
@@ -248,6 +248,8 @@ void testDurationCalculationOfStepsAndHooks() throws Throwable {
         stepsToResult.put("step", result("passed"));
         hooks.add(TestHelper.hookEntry("before", result("passed")));
         hooks.add(TestHelper.hookEntry("after", result("passed")));
+        hookLocations.add("hook-location-1");
+        hookLocations.add("hook-location-2");
         stepDuration = ofMillis(1);
         String actual = runFeaturesWithFormatter(false);
         assertXmlEqual("" +
@@ -277,6 +279,7 @@ void testScenarioWithFailedBeforeHook() throws Throwable {
         features.add(feature);
         stepsToResult.put("step", result("skipped"));
         hooks.add(TestHelper.hookEntry("before", result("failed", new TestNGException("message", "stacktrace"))));
+        hookLocations.add("hook-location");
         stepDuration = ZERO;
         String actual = runFeaturesWithFormatter(false);
         assertXmlEqual("" +
@@ -309,6 +312,7 @@ void testScenarioWithFailedAfterHook() throws Throwable {
         features.add(feature);
         stepsToResult.put("step", result("passed"));
         hooks.add(TestHelper.hookEntry("after", result("failed", new TestNGException("message", "stacktrace"))));
+        hookLocations.add("hook-location");
         stepDuration = ZERO;
         String actual = runFeaturesWithFormatter(false);
         assertXmlEqual("" +
diff --git a/core/src/test/java/io/cucumber/core/plugin/TimelineFormatterTest.java b/core/src/test/java/io/cucumber/core/plugin/TimelineFormatterTest.java
index 1c14302cb4..d4ddc81fb3 100644
--- a/core/src/test/java/io/cucumber/core/plugin/TimelineFormatterTest.java
+++ b/core/src/test/java/io/cucumber/core/plugin/TimelineFormatterTest.java
@@ -1,8 +1,8 @@
 package io.cucumber.core.plugin;
 
-import gherkin.deps.com.google.gson.Gson;
-import gherkin.deps.com.google.gson.GsonBuilder;
-import gherkin.deps.com.google.gson.JsonDeserializer;
+import io.cucumber.messages.internal.com.google.gson.Gson;
+import io.cucumber.messages.internal.com.google.gson.GsonBuilder;
+import io.cucumber.messages.internal.com.google.gson.JsonDeserializer;
 import io.cucumber.plugin.event.Result;
 import io.cucumber.core.gherkin.Feature;
 import io.cucumber.core.feature.TestFeatureParser;
diff --git a/core/src/test/java/io/cucumber/core/runner/CoreStepDefinitionTest.java b/core/src/test/java/io/cucumber/core/runner/CoreStepDefinitionTest.java
index 5902c57979..70b2732c85 100644
--- a/core/src/test/java/io/cucumber/core/runner/CoreStepDefinitionTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/CoreStepDefinitionTest.java
@@ -14,6 +14,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.UUID;
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
@@ -27,6 +28,7 @@
 class CoreStepDefinitionTest {
 
     private final StepTypeRegistry stepTypeRegistry = new StepTypeRegistry(Locale.ENGLISH);
+    private final UUID id = UUID.randomUUID();
 
     @Test
     void should_apply_identity_transform_to_doc_string_when_target_type_is_object() {
@@ -39,7 +41,7 @@ void should_apply_identity_transform_to_doc_string_when_target_type_is_object()
             "       \"\"\"\n"
         );
         StubStepDefinition stub = new StubStepDefinition("I have some step", Object.class);
-        CoreStepDefinition stepDefinition = new CoreStepDefinition(stub, stepTypeRegistry);
+        CoreStepDefinition stepDefinition = new CoreStepDefinition(id, stub, stepTypeRegistry);
         Step step = feature.getPickles().get(0).getSteps().get(0);
         List<Argument> arguments = stepDefinition.matchedArguments(step);
         assertThat(arguments.get(0).getValue(), is(equalTo(DocString.create("content"))));
@@ -55,7 +57,7 @@ void should_apply_identity_transform_to_data_table_when_target_type_is_object()
             "      | content |\n"
         );
         StubStepDefinition stub = new StubStepDefinition("I have some step", Object.class);
-        CoreStepDefinition stepDefinition = new CoreStepDefinition(stub, stepTypeRegistry);
+        CoreStepDefinition stepDefinition = new CoreStepDefinition(id, stub, stepTypeRegistry);
         List<Argument> arguments = stepDefinition.matchedArguments(feature.getPickles().get(0).getSteps().get(0));
         assertThat(arguments.get(0).getValue(), is(equalTo(DataTable.create(singletonList(singletonList("content"))))));
     }
@@ -69,7 +71,7 @@ void should_convert_empty_pickle_table_cells_to_null_values() {
             "       |  |\n"
         );
         StubStepDefinition stub = new StubStepDefinition("I have some step", Object.class);
-        CoreStepDefinition stepDefinition = new CoreStepDefinition(stub, stepTypeRegistry);
+        CoreStepDefinition stepDefinition = new CoreStepDefinition(id, stub, stepTypeRegistry);
         List<Argument> arguments = stepDefinition.matchedArguments(feature.getPickles().get(0).getSteps().get(0));
         assertEquals(DataTable.create(singletonList(singletonList(null))), arguments.get(0).getValue());
     }
@@ -193,7 +195,7 @@ void passes_transposed_data_table() throws Throwable {
     @SuppressWarnings("unchecked")
     private <T> T runStepDef(Method method, boolean transposed, Feature feature) {
         StubStepDefinition stub = new StubStepDefinition("some text", transposed, method.getGenericParameterTypes());
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stub, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stub, stepTypeRegistry);
         Step stepWithTable = feature.getPickles().get(0).getSteps().get(0);
         List<Argument> arguments = coreStepDefinition.matchedArguments(stepWithTable);
 
diff --git a/core/src/test/java/io/cucumber/core/runner/HookOrderTest.java b/core/src/test/java/io/cucumber/core/runner/HookOrderTest.java
index aae5edddfe..d4e54d1dbc 100644
--- a/core/src/test/java/io/cucumber/core/runner/HookOrderTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/HookOrderTest.java
@@ -186,6 +186,7 @@ private List<HookDefinition> mockHooks(int... ordering) {
             HookDefinition hook = mock(HookDefinition.class, "Mock number " + order);
             when(hook.getOrder()).thenReturn(order);
             when(hook.getTagExpression()).thenReturn("");
+            when(hook.getLocation()).thenReturn("Mock location");
             hooks.add(hook);
         }
         return hooks;
diff --git a/core/src/test/java/io/cucumber/core/runner/HookTest.java b/core/src/test/java/io/cucumber/core/runner/HookTest.java
index 78bb2fcaa4..b42744db84 100644
--- a/core/src/test/java/io/cucumber/core/runner/HookTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/HookTest.java
@@ -47,6 +47,7 @@ void after_hooks_execute_before_objects_are_disposed() {
         when(backend.getSnippet()).thenReturn(new TestSnippet());
         ObjectFactory objectFactory = mock(ObjectFactory.class);
         final HookDefinition hook = mock(HookDefinition.class);
+        when(hook.getLocation()).thenReturn("hook-location");
         TypeRegistryConfigurer typeRegistryConfigurer = mock(TypeRegistryConfigurer.class);
         when(hook.getTagExpression()).thenReturn("");
 
diff --git a/core/src/test/java/io/cucumber/core/runner/HookTestStepTest.java b/core/src/test/java/io/cucumber/core/runner/HookTestStepTest.java
index 97a43d829e..c8bf68c319 100644
--- a/core/src/test/java/io/cucumber/core/runner/HookTestStepTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/HookTestStepTest.java
@@ -45,9 +45,9 @@ class HookTestStepTest {
         false
     );
     private final EventBus bus = mock(EventBus.class);
-    private final TestCaseState state = new TestCaseState(bus, testCase);
-    private final HookTestStep step = new HookTestStep(UUID.randomUUID(), HookType.AFTER_STEP, definitionMatch);
     private final UUID testExecutionId = UUID.randomUUID();
+    private final TestCaseState state = new TestCaseState(bus, testExecutionId, testCase);
+    private HookTestStep step = new HookTestStep(UUID.randomUUID(), HookType.AFTER_STEP, definitionMatch);
 
     @BeforeEach
     void init() {
@@ -56,7 +56,7 @@ void init() {
 
     @Test
     void run_does_run() {
-        step.run(testCase, bus, state, false, testExecutionId);
+        step.run(testCase, bus, state, false);
 
         InOrder order = inOrder(bus, hookDefintion);
         order.verify(bus).send(isA(TestStepStarted.class));
@@ -66,7 +66,7 @@ void run_does_run() {
 
     @Test
     void run_does_dry_run() {
-        step.run(testCase, bus, state, true, testExecutionId);
+        step.run(testCase, bus, state, true);
 
         InOrder order = inOrder(bus, hookDefintion);
         order.verify(bus).send(isA(TestStepStarted.class));
@@ -76,14 +76,14 @@ void run_does_dry_run() {
 
     @Test
     void result_is_passed_when_step_definition_does_not_throw_exception() {
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertFalse(skipNextStep);
         assertThat(state.getStatus(), is(equalTo(PASSED)));
     }
 
     @Test
     void result_is_skipped_when_skip_step_is_skip_all_skipable() {
-        boolean skipNextStep = step.run(testCase, bus, state, true, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, true);
         assertTrue(skipNextStep);
         assertThat(state.getStatus(), is(equalTo(SKIPPED)));
     }
diff --git a/core/src/test/java/io/cucumber/core/runner/PickleStepTestStepTest.java b/core/src/test/java/io/cucumber/core/runner/PickleStepTestStepTest.java
index 7df8435ccb..a7943f7ecf 100644
--- a/core/src/test/java/io/cucumber/core/runner/PickleStepTestStepTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/PickleStepTestStepTest.java
@@ -60,7 +60,8 @@ class PickleStepTestStepTest {
     private final Pickle pickle = feature.getPickles().get(0);
     private final TestCase testCase = new TestCase(UUID.randomUUID(), Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), pickle, false);
     private final EventBus bus = mock(EventBus.class);
-    private final TestCaseState state = new TestCaseState(bus, testCase);
+    private final UUID testExecutionId = UUID.randomUUID();
+    private final TestCaseState state = new TestCaseState(bus, testExecutionId, testCase);
     private final PickleStepDefinitionMatch definitionMatch = mock(PickleStepDefinitionMatch.class);
     private final CoreHookDefinition afterHookDefinition = mock(CoreHookDefinition.class);
     private final HookTestStep afterHook = new HookTestStep(UUID.randomUUID(), AFTER_STEP, new HookDefinitionMatch(afterHookDefinition));
@@ -74,7 +75,6 @@ class PickleStepTestStepTest {
         singletonList(afterHook),
         definitionMatch
     );
-    private final UUID testExecutionId = UUID.randomUUID();
     private static ArgumentMatcher<TestCaseState> scenarioDoesNotHave(final Throwable type) {
         return argument -> !type.equals(argument.getError());
     }
@@ -86,7 +86,7 @@ void init() {
 
     @Test
     void run_wraps_run_step_in_test_step_started_and_finished_events() throws Throwable {
-        step.run(testCase, bus, state, false, testExecutionId);
+        step.run(testCase, bus, state, false);
 
         InOrder order = inOrder(bus, definitionMatch);
         order.verify(bus).send(isA(TestStepStarted.class));
@@ -96,7 +96,7 @@ void run_wraps_run_step_in_test_step_started_and_finished_events() throws Throwa
 
     @Test
     void run_does_dry_run_step_when_skip_steps_is_true() throws Throwable {
-        step.run(testCase, bus, state, true, testExecutionId);
+        step.run(testCase, bus, state, true);
 
         InOrder order = inOrder(bus, definitionMatch);
         order.verify(bus).send(isA(TestStepStarted.class));
@@ -106,14 +106,14 @@ void run_does_dry_run_step_when_skip_steps_is_true() throws Throwable {
 
     @Test
     void result_is_passed_when_step_definition_does_not_throw_exception() {
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertFalse(skipNextStep);
         assertThat(state.getStatus(), is(equalTo(PASSED)));
     }
 
     @Test
     void result_is_skipped_when_skip_step_is_not_run_all() {
-        boolean skipNextStep = step.run(testCase, bus, state, true, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, true);
 
         assertTrue(skipNextStep);
         assertThat(state.getStatus(), is(equalTo(SKIPPED)));
@@ -122,7 +122,7 @@ void result_is_skipped_when_skip_step_is_not_run_all() {
     @Test
     void result_is_skipped_when_before_step_hook_does_not_pass() {
         doThrow(TestAbortedException.class).when(beforeHookDefinition).execute(any(TestCaseState.class));
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertTrue(skipNextStep);
         assertThat(state.getStatus(), is(equalTo(SKIPPED)));
     }
@@ -130,7 +130,7 @@ void result_is_skipped_when_before_step_hook_does_not_pass() {
     @Test
     void step_execution_is_dry_run_when_before_step_hook_does_not_pass() throws Throwable {
         doThrow(TestAbortedException.class).when(beforeHookDefinition).execute(any(TestCaseState.class));
-        step.run(testCase, bus, state, false, testExecutionId);
+        step.run(testCase, bus, state, false);
         verify(definitionMatch).dryRunStep(any(TestCaseState.class));
     }
 
@@ -139,14 +139,14 @@ void result_is_result_from_hook_when_before_step_hook_does_not_pass() {
         Exception exception = new RuntimeException();
         doThrow(exception).when(beforeHookDefinition).execute(any(TestCaseState.class));
         Result failure = new Result(Status.FAILED, ZERO, exception);
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertTrue(skipNextStep);
         assertThat(state.getStatus(), is(equalTo(FAILED)));
 
         ArgumentCaptor<TestCaseEvent> captor = forClass(TestCaseEvent.class);
-        verify(bus, times(6)).send(captor.capture());
+        verify(bus, times(12)).send(captor.capture());
         List<TestCaseEvent> allValues = captor.getAllValues();
-        assertThat(((TestStepFinished) allValues.get(1)).getResult(), is(equalTo(failure)));
+        assertThat(((TestStepFinished) allValues.get(2)).getResult(), is(equalTo(failure)));
     }
 
     @Test
@@ -154,14 +154,14 @@ void result_is_result_from_step_when_step_hook_does_not_pass() throws Throwable
         RuntimeException runtimeException = new RuntimeException();
         Result failure = new Result(Status.FAILED, ZERO, runtimeException);
         doThrow(runtimeException).when(definitionMatch).runStep(any(TestCaseState.class));
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertTrue(skipNextStep);
         assertThat(state.getStatus(), is(equalTo(FAILED)));
 
         ArgumentCaptor<TestCaseEvent> captor = forClass(TestCaseEvent.class);
-        verify(bus, times(6)).send(captor.capture());
+        verify(bus, times(12)).send(captor.capture());
         List<TestCaseEvent> allValues = captor.getAllValues();
-        assertThat(((TestStepFinished) allValues.get(3)).getResult(), is(equalTo(failure)));
+        assertThat(((TestStepFinished) allValues.get(6)).getResult(), is(equalTo(failure)));
     }
 
     @Test
@@ -169,27 +169,27 @@ void result_is_result_from_hook_when_after_step_hook_does_not_pass() {
         Exception exception = new RuntimeException();
         Result failure = new Result(Status.FAILED, ZERO, exception);
         doThrow(exception).when(afterHookDefinition).execute(any(TestCaseState.class));
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertTrue(skipNextStep);
         assertThat(state.getStatus(), is(equalTo(FAILED)));
 
-        ArgumentCaptor<TestCaseEvent> captor = forClass(TestCaseEvent.class);
-        verify(bus, times(6)).send(captor.capture());
-        List<TestCaseEvent> allValues = captor.getAllValues();
-        assertThat(((TestStepFinished) allValues.get(5)).getResult(), is(equalTo(failure)));
+        ArgumentCaptor<Object> captor = forClass(TestCaseEvent.class);
+        verify(bus, times(12)).send(captor.capture());
+        List<Object> allValues = captor.getAllValues();
+        assertThat(((TestStepFinished) allValues.get(10)).getResult(), is(equalTo(failure)));
     }
 
     @Test
     void after_step_hook_is_run_when_before_step_hook_does_not_pass() {
         doThrow(RuntimeException.class).when(beforeHookDefinition).execute(any(TestCaseState.class));
-        step.run(testCase, bus, state, false, testExecutionId);
+        step.run(testCase, bus, state, false);
         verify(afterHookDefinition).execute(any(TestCaseState.class));
     }
 
     @Test
     void after_step_hook_is_run_when_step_does_not_pass() throws Throwable {
         doThrow(Exception.class).when(definitionMatch).runStep(any(TestCaseState.class));
-        step.run(testCase, bus, state, false, testExecutionId);
+        step.run(testCase, bus, state, false);
         verify(afterHookDefinition).execute(any(TestCaseState.class));
     }
 
@@ -198,7 +198,7 @@ void after_step_hook_scenario_contains_step_failure_when_step_does_not_pass() th
         Throwable expectedError = new TestAbortedException("oops");
         doThrow(expectedError).when(definitionMatch).runStep(any(TestCaseState.class));
         doThrow(new RuntimeException()).when(afterHookDefinition).execute(argThat(scenarioDoesNotHave(expectedError)));
-        step.run(testCase, bus, state, false, testExecutionId);
+        step.run(testCase, bus, state, false);
         assertThat(state.getError(), is(expectedError));
     }
 
@@ -207,7 +207,7 @@ void after_step_hook_scenario_contains_before_step_hook_failure_when_before_step
         Throwable expectedError = new TestAbortedException("oops");
         doThrow(expectedError).when(beforeHookDefinition).execute(any(TestCaseState.class));
         doThrow(new RuntimeException()).when(afterHookDefinition).execute(argThat(scenarioDoesNotHave(expectedError)));
-        step.run(testCase, bus, state, false, testExecutionId);
+        step.run(testCase, bus, state, false);
         assertThat(state.getError(), is(expectedError));
     }
 
@@ -215,7 +215,7 @@ void after_step_hook_scenario_contains_before_step_hook_failure_when_before_step
     void result_is_skipped_when_step_definition_throws_assumption_violated_exception() throws Throwable {
         doThrow(TestAbortedException.class).when(definitionMatch).runStep(any());
 
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertTrue(skipNextStep);
 
         assertThat(state.getStatus(), is(equalTo(SKIPPED)));
@@ -225,7 +225,7 @@ void result_is_skipped_when_step_definition_throws_assumption_violated_exception
     void result_is_failed_when_step_definition_throws_exception() throws Throwable {
         doThrow(RuntimeException.class).when(definitionMatch).runStep(any(TestCaseState.class));
 
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertTrue(skipNextStep);
 
         assertThat(state.getStatus(), is(equalTo(FAILED)));
@@ -235,7 +235,7 @@ void result_is_failed_when_step_definition_throws_exception() throws Throwable {
     void result_is_pending_when_step_definition_throws_pending_exception() throws Throwable {
         doThrow(TestPendingException.class).when(definitionMatch).runStep(any(TestCaseState.class));
 
-        boolean skipNextStep = step.run(testCase, bus, state, false, testExecutionId);
+        boolean skipNextStep = step.run(testCase, bus, state, false);
         assertTrue(skipNextStep);
 
         assertThat(state.getStatus(), is(equalTo(PENDING)));
@@ -256,14 +256,14 @@ void step_execution_time_is_measured() {
             definitionMatch
         );
         when(bus.getInstant()).thenReturn(ofEpochMilli(234L), ofEpochMilli(1234L));
-        step.run(testCase, bus, state, false, testExecutionId);
+        step.run(testCase, bus, state, false);
 
         ArgumentCaptor<TestCaseEvent> captor = forClass(TestCaseEvent.class);
-        verify(bus, times(2)).send(captor.capture());
+        verify(bus, times(4)).send(captor.capture());
 
         List<TestCaseEvent> allValues = captor.getAllValues();
         TestStepStarted started = (TestStepStarted) allValues.get(0);
-        TestStepFinished finished = (TestStepFinished) allValues.get(1);
+        TestStepFinished finished = (TestStepFinished) allValues.get(2);
 
         assertAll("Checking TestStep",
             () -> assertThat(started.getInstant(), is(equalTo(ofEpochMilli(234L)))),
diff --git a/core/src/test/java/io/cucumber/core/runner/RunnerTest.java b/core/src/test/java/io/cucumber/core/runner/RunnerTest.java
index 361d06e4ee..e65e6b7f17 100644
--- a/core/src/test/java/io/cucumber/core/runner/RunnerTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/RunnerTest.java
@@ -77,7 +77,7 @@ void steps_are_skipped_after_failure() {
         Pickle pickleMatchingStepDefinitions = createPickleMatchingStepDefinitions(stepDefinition);
 
         final HookDefinition failingBeforeHook = addBeforeHook();
-        doThrow(RuntimeException.class).when(failingBeforeHook).execute(ArgumentMatchers.any());
+        doThrow(new RuntimeException("Boom")).when(failingBeforeHook).execute(ArgumentMatchers.any());
         TestRunnerSupplier runnerSupplier = new TestRunnerSupplier(bus, runtimeOptions) {
             @Override
             public void loadGlue(Glue glue, List<URI> gluePaths) {
@@ -106,21 +106,21 @@ public void execute(Object[] args) {
 
         Pickle pickleMatchingStepDefinitions = createPickleMatchingStepDefinitions(stepDefinition);
 
-        final HookDefinition afteStepHook = addAfterStepHook();
+        final HookDefinition afterStepHook = addAfterStepHook();
 
         TestRunnerSupplier runnerSupplier = new TestRunnerSupplier(bus, runtimeOptions) {
             @Override
             public void loadGlue(Glue glue, List<URI> gluePaths) {
-                glue.addAfterHook(afteStepHook);
+                glue.addAfterHook(afterStepHook);
                 glue.addStepDefinition(stepDefinition);
             }
         };
 
         runnerSupplier.get().runPickle(pickleMatchingStepDefinitions);
 
-        InOrder inOrder = inOrder(afteStepHook, stepDefinition);
+        InOrder inOrder = inOrder(afterStepHook, stepDefinition);
         inOrder.verify(stepDefinition).execute(any(Object[].class));
-        inOrder.verify(afteStepHook).execute(any(TestCaseState.class));
+        inOrder.verify(afterStepHook).execute(any(TestCaseState.class));
     }
 
     @Test
@@ -151,7 +151,7 @@ public void loadGlue(Glue glue, List<URI> gluePaths) {
     @Test
     void hooks_execute_also_after_failure() {
         final HookDefinition failingBeforeHook = addBeforeHook();
-        doThrow(RuntimeException.class).when(failingBeforeHook).execute(any(TestCaseState.class));
+        doThrow(new RuntimeException("boom")).when(failingBeforeHook).execute(any(TestCaseState.class));
         final HookDefinition beforeHook = addBeforeHook();
         final HookDefinition afterHook = addAfterHook();
 
@@ -274,6 +274,7 @@ private HookDefinition addAfterStepHook() {
     private HookDefinition addHook() {
         HookDefinition hook = mock(HookDefinition.class);
         when(hook.getTagExpression()).thenReturn("");
+        when(hook.getLocation()).thenReturn("");
         return hook;
     }
 
diff --git a/core/src/test/java/io/cucumber/core/runner/StepDefinitionMatchTest.java b/core/src/test/java/io/cucumber/core/runner/StepDefinitionMatchTest.java
index c6fbc84580..b1b1622c86 100644
--- a/core/src/test/java/io/cucumber/core/runner/StepDefinitionMatchTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/StepDefinitionMatchTest.java
@@ -21,6 +21,7 @@
 import java.net.URI;
 import java.util.Collections;
 import java.util.List;
+import java.util.UUID;
 
 import static java.util.Arrays.asList;
 import static java.util.Locale.ENGLISH;
@@ -33,6 +34,7 @@
 class StepDefinitionMatchTest {
 
     private final StepTypeRegistry stepTypeRegistry = new StepTypeRegistry(ENGLISH);
+    private final UUID id = UUID.randomUUID();
 
     private final Located stubbedLocation = new Located() {
         @Override
@@ -57,7 +59,7 @@ void executes_a_step() throws Throwable {
         Step step = feature.getPickles().get(0).getSteps().get(0);
 
         StepDefinition stepDefinition = new StubStepDefinition("I have {int} cukes in my belly", Integer.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
         stepDefinitionMatch.runStep(null);
@@ -73,7 +75,7 @@ void throws_arity_mismatch_exception_when_there_are_fewer_parameters_than_argume
         Step step = feature.getPickles().get(0).getSteps().get(0);
 
         StepDefinition stepDefinition = new StubStepDefinition("I have {int} cukes in my belly");
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -99,7 +101,7 @@ void throws_arity_mismatch_exception_when_there_are_fewer_parameters_than_argume
         Step step = feature.getPickles().get(0).getSteps().get(0);
 
         StepDefinition stepDefinition = new StubStepDefinition("I have {int} cukes in my belly");
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         PickleStepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -129,7 +131,7 @@ void throws_arity_mismatch_exception_when_there_are_more_parameters_than_argumen
         Step step = feature.getPickles().get(0).getSteps().get(0);
 
         StepDefinition stepDefinition = new StubStepDefinition("I have {int} cukes in my belly", Integer.TYPE, Short.TYPE, List.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         PickleStepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -156,7 +158,7 @@ void throws_arity_mismatch_exception_when_there_are_more_parameters_and_no_argum
         );
         Step step = feature.getPickles().get(0).getSteps().get(0);
         StepDefinition stepDefinition = new StubStepDefinition("I have cukes in my belly", Integer.TYPE, Short.TYPE, List.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -183,7 +185,7 @@ void throws_register_type_in_configuration_exception_when_there_is_no_data_table
             "I have a data table",
             UndefinedDataTableType.class
         );
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(
             arguments,
@@ -216,7 +218,7 @@ void throws_could_not_convert_exception_for_transformer_and_capture_group_mismat
         );
         Step step = feature.getPickles().get(0).getSteps().get(0);
         StepDefinition stepDefinition = new StubStepDefinition("I have {itemQuantity} in my belly", ItemQuantity.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -248,7 +250,7 @@ void rethrows_target_invocation_exceptions_from_parameter_type() {
         );
         Step step = feature.getPickles().get(0).getSteps().get(0);
         StepDefinition stepDefinition = new StubStepDefinition("I have {itemQuantity} in my belly", ItemQuantity.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -272,7 +274,7 @@ void throws_could_not_convert_exception_for_singleton_table_dimension_mismatch()
 
         Step step = feature.getPickles().get(0).getSteps().get(0);
         StepDefinition stepDefinition = new StubStepDefinition("I have some cukes in my belly", ItemQuantity.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -305,7 +307,7 @@ void rethrows_target_invocation_exceptions_from_data_table() {
 
         Step step = feature.getPickles().get(0).getSteps().get(0);
         StepDefinition stepDefinition = new StubStepDefinition("I have some cukes in my belly", ItemQuantity.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -331,7 +333,7 @@ void throws_could_not_convert_exception_for_docstring() {
 
         Step step = feature.getPickles().get(0).getSteps().get(0);
         StepDefinition stepDefinition = new StubStepDefinition("I have some cukes in my belly", ItemQuantity.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
@@ -362,7 +364,7 @@ void rethrows_target_invocation_exception_for_docstring() {
 
         Step step = feature.getPickles().get(0).getSteps().get(0);
         StepDefinition stepDefinition = new StubStepDefinition("I have some cukes in my belly", ItemQuantity.class);
-        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(stepDefinition, stepTypeRegistry);
+        CoreStepDefinition coreStepDefinition = new CoreStepDefinition(id, stepDefinition, stepTypeRegistry);
         List<Argument> arguments = coreStepDefinition.matchedArguments(step);
         StepDefinitionMatch stepDefinitionMatch = new PickleStepDefinitionMatch(arguments, stepDefinition, null, step);
 
diff --git a/core/src/test/java/io/cucumber/core/runner/TestCaseStateResultTest.java b/core/src/test/java/io/cucumber/core/runner/TestCaseStateResultTest.java
index c2921b1079..6e9040039a 100644
--- a/core/src/test/java/io/cucumber/core/runner/TestCaseStateResultTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/TestCaseStateResultTest.java
@@ -43,6 +43,7 @@ class TestCaseStateResultTest {
     private final EventBus bus = mock(EventBus.class);
     private final TestCaseState s = new TestCaseState(
         bus,
+        UUID.randomUUID(),
         new TestCase(
             UUID.randomUUID(),
             Collections.emptyList(),
@@ -56,6 +57,7 @@ class TestCaseStateResultTest {
     @BeforeEach
     void setup() {
         when(bus.getInstant()).thenReturn(Instant.now());
+        s.setCurrentTestStepId(UUID.randomUUID());
     }
 
     @Test
diff --git a/core/src/test/java/io/cucumber/core/runner/TestCaseStateTest.java b/core/src/test/java/io/cucumber/core/runner/TestCaseStateTest.java
index f74e61ff18..8a1e73e088 100644
--- a/core/src/test/java/io/cucumber/core/runner/TestCaseStateTest.java
+++ b/core/src/test/java/io/cucumber/core/runner/TestCaseStateTest.java
@@ -82,7 +82,9 @@ void provides_the_uri_and_example_row_line_as_unique_id_for_scenarios_from_scena
     }
 
     private TestCaseState createTestCaseState(Feature feature) {
-        return new TestCaseState(mock(EventBus.class), new TestCase(
+        return new TestCaseState(mock(EventBus.class),
+            UUID.randomUUID(),
+            new TestCase(
             UUID.randomUUID(),
             Collections.emptyList(),
             Collections.emptyList(),
diff --git a/core/src/test/java/io/cucumber/core/runner/TestHelper.java b/core/src/test/java/io/cucumber/core/runner/TestHelper.java
index 7df9a83cbc..b0338343df 100644
--- a/core/src/test/java/io/cucumber/core/runner/TestHelper.java
+++ b/core/src/test/java/io/cucumber/core/runner/TestHelper.java
@@ -379,6 +379,9 @@ private static void mockHook(final SimpleEntry<String, Result> hookEntry,
                                      final List<HookDefinition> beforeStepHooks,
                                      final List<HookDefinition> afterStepHooks) {
             HookDefinition hook = mock(HookDefinition.class);
+            if(hookLocation == null) {
+                throw new RuntimeException("hookLocation cannot be null");
+            }
             when(hook.getTagExpression()).thenReturn("");
             if (hookLocation != null) {
                 when(hook.getLocation()).thenReturn(hookLocation);
diff --git a/core/src/test/java/io/cucumber/core/runtime/RuntimeTest.java b/core/src/test/java/io/cucumber/core/runtime/RuntimeTest.java
index d8aab3e609..9bcbed59dc 100644
--- a/core/src/test/java/io/cucumber/core/runtime/RuntimeTest.java
+++ b/core/src/test/java/io/cucumber/core/runtime/RuntimeTest.java
@@ -13,7 +13,6 @@
 import io.cucumber.core.feature.TestFeatureParser;
 import io.cucumber.core.options.CommandlineOptionsParser;
 import io.cucumber.core.options.RuntimeOptionsBuilder;
-import io.cucumber.core.plugin.FormatterBuilder;
 import io.cucumber.core.plugin.FormatterSpy;
 import io.cucumber.core.runner.StepDurationTimeService;
 import io.cucumber.core.runner.TestBackendSupplier;
@@ -66,81 +65,6 @@ class RuntimeTest {
 
     private final EventBus bus = new TimeServiceEventBus(Clock.systemUTC(), UUID::randomUUID);
 
-    @Test
-    void runs_feature_with_json_formatter() {
-        final Feature feature = TestFeatureParser.parse("test.feature", "" +
-            "Feature: feature name\n" +
-            "  Background: background name\n" +
-            "    Given b\n" +
-            "  Scenario: scenario name\n" +
-            "    When s\n");
-        StringBuilder out = new StringBuilder();
-
-        Plugin jsonFormatter = FormatterBuilder.jsonFormatter(out);
-
-        FeatureSupplier featureSupplier = new TestFeatureSupplier(bus, feature);
-        Runtime.builder()
-            .withAdditionalPlugins(jsonFormatter)
-            .withEventBus(new TimeServiceEventBus(Clock.fixed(Instant.EPOCH, ZoneId.of("UTC")), UUID::randomUUID))
-            .withFeatureSupplier(featureSupplier)
-            .build()
-            .run();
-
-        String expected = "" +
-            "[\n" +
-            "  {\n" +
-            "    \"line\": 1,\n" +
-            "    \"elements\": [\n" +
-            "      {\n" +
-            "        \"line\": 2,\n" +
-            "        \"name\": \"background name\",\n" +
-            "        \"description\": \"\",\n" +
-            "        \"type\": \"background\",\n" +
-            "        \"keyword\": \"Background\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"undefined\"\n" +
-            "            },\n" +
-            "            \"line\": 3,\n" +
-            "            \"name\": \"b\",\n" +
-            "            \"match\": {},\n" +
-            "            \"keyword\": \"Given \"\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      },\n" +
-            "      {\n" +
-            "        \"line\": 4,\n" +
-            "        \"name\": \"scenario name\",\n" +
-            "        \"description\": \"\",\n" +
-            "        \"id\": \"feature-name;scenario-name\",\n" +
-            "        \"start_timestamp\": \"1970-01-01T00:00:00.000Z\",\n" +
-            "        \"type\": \"scenario\",\n" +
-            "        \"keyword\": \"Scenario\",\n" +
-            "        \"steps\": [\n" +
-            "          {\n" +
-            "            \"result\": {\n" +
-            "              \"status\": \"undefined\"\n" +
-            "            },\n" +
-            "            \"line\": 5,\n" +
-            "            \"name\": \"s\",\n" +
-            "            \"match\": {},\n" +
-            "            \"keyword\": \"When \"\n" +
-            "          }\n" +
-            "        ]\n" +
-            "      }\n" +
-            "    ],\n" +
-            "    \"name\": \"feature name\",\n" +
-            "    \"description\": \"\",\n" +
-            "    \"id\": \"feature-name\",\n" +
-            "    \"keyword\": \"Feature\",\n" +
-            "    \"uri\": \"file:test.feature\",\n" +
-            "    \"tags\": []\n" +
-            "  }\n" +
-            "]";
-        assertThat(out.toString(), sameJSONAs(expected));
-    }
-
     @Test
     void strict_with_passed_scenarios() {
         Runtime runtime = createStrictRuntime();
@@ -257,6 +181,7 @@ void should_make_scenario_name_available_to_hooks() {
                 "    When second step\n" +
                 "    Then third step\n");
         final HookDefinition beforeHook = mock(HookDefinition.class);
+        when(beforeHook.getLocation()).thenReturn("");
         when(beforeHook.getTagExpression()).thenReturn("");
 
         TestBackendSupplier testBackendSupplier = createTestBackendSupplier(feature, beforeHook);
diff --git a/core/src/test/resources/io/cucumber/core/plugin/HTMLFormatterTest.feature b/core/src/test/resources/io/cucumber/core/plugin/HTMLFormatterTest.feature
deleted file mode 100644
index 1c260cf28f..0000000000
--- a/core/src/test/resources/io/cucumber/core/plugin/HTMLFormatterTest.feature
+++ /dev/null
@@ -1,6 +0,0 @@
-Feature: Hello
-
-  Scenario: World
-    Given a'
-    Given b"
-    Given &
\ No newline at end of file
diff --git a/core/src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.feature b/core/src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.feature
deleted file mode 100644
index 3f1873e675..0000000000
--- a/core/src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.feature
+++ /dev/null
@@ -1,28 +0,0 @@
-Feature: Feature_3
-
-  Background:
-    Given bg_1
-    When bg_2
-    Then bg_3
-
-  Scenario: Scenario_1
-    Given step_1
-    When step_2
-    Then step_3
-    Then cliché
-
-  Scenario Outline: ScenarioOutline_1
-    Given so_1 <a>
-    When so_2 <c> cucumbers
-    Then <b> so_3
-
-  Examples:
-    | a  | b | c  |
-    | 12 | 5 | 7  |
-    | 20 | 5 | 15 |
-
-  Scenario: Scenario_2
-    Given a
-    Then b
-    When c
-
diff --git a/core/src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.json b/core/src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.json
deleted file mode 100644
index 9db6012f44..0000000000
--- a/core/src/test/resources/io/cucumber/core/plugin/JSONPrettyFormatterTest.json
+++ /dev/null
@@ -1,354 +0,0 @@
-[
-  {
-    "line": 1,
-    "elements": [
-      {
-        "line": 3,
-        "name": "",
-        "description": "",
-        "type": "background",
-        "keyword": "Background",
-        "steps": [
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 4,
-            "name": "bg_1",
-            "match": {},
-            "keyword": "Given "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 5,
-            "name": "bg_2",
-            "match": {},
-            "keyword": "When "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 6,
-            "name": "bg_3",
-            "match": {},
-            "keyword": "Then "
-          }
-        ]
-      },
-      {
-        "start_timestamp": "1970-01-01T00:00:11.106Z",
-        "before": [
-          {
-            "result": {
-              "duration": 1234000000,
-              "status": "passed"
-            },
-            "match": {}
-          }
-        ],
-        "line": 8,
-        "name": "Scenario_1",
-        "description": "",
-        "id": "feature-3;scenario-1",
-        "type": "scenario",
-        "keyword": "Scenario",
-        "steps": [
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 9,
-            "name": "step_1",
-            "match": {},
-            "keyword": "Given "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 10,
-            "name": "step_2",
-            "match": {},
-            "keyword": "When "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 11,
-            "name": "step_3",
-            "match": {},
-            "keyword": "Then "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 12,
-            "name": "cliché",
-            "match": {},
-            "keyword": "Then "
-          }
-        ]
-      },
-      {
-        "line": 3,
-        "name": "",
-        "description": "",
-        "type": "background",
-        "keyword": "Background",
-        "steps": [
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 4,
-            "name": "bg_1",
-            "match": {},
-            "keyword": "Given "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 5,
-            "name": "bg_2",
-            "match": {},
-            "keyword": "When "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 6,
-            "name": "bg_3",
-            "match": {},
-            "keyword": "Then "
-          }
-        ]
-      },
-      {
-        "start_timestamp": "1970-01-01T00:00:40.722Z",
-        "before": [
-          {
-            "result": {
-              "duration": 1234000000,
-              "status": "passed"
-            },
-            "match": {}
-          }
-        ],
-        "line": 21,
-        "name": "ScenarioOutline_1",
-        "description": "",
-        "id": "feature-3;scenariooutline-1;;2",
-        "type": "scenario",
-        "keyword": "Scenario Outline",
-        "steps": [
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 15,
-            "name": "so_1 12",
-            "match": {},
-            "keyword": "Given "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 16,
-            "name": "so_2 7 cucumbers",
-            "match": {},
-            "keyword": "When "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 17,
-            "name": "5 so_3",
-            "match": {},
-            "keyword": "Then "
-          }
-        ]
-      },
-      {
-        "line": 3,
-        "name": "",
-        "description": "",
-        "type": "background",
-        "keyword": "Background",
-        "steps": [
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 4,
-            "name": "bg_1",
-            "match": {},
-            "keyword": "Given "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 5,
-            "name": "bg_2",
-            "match": {},
-            "keyword": "When "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 6,
-            "name": "bg_3",
-            "match": {},
-            "keyword": "Then "
-          }
-        ]
-      },
-      {
-        "start_timestamp": "1970-01-01T00:01:07.870Z",
-        "before": [
-          {
-            "result": {
-              "duration": 1234000000,
-              "status": "passed"
-            },
-            "match": {}
-          }
-        ],
-        "line": 22,
-        "name": "ScenarioOutline_1",
-        "description": "",
-        "id": "feature-3;scenariooutline-1;;3",
-        "type": "scenario",
-        "keyword": "Scenario Outline",
-        "steps": [
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 15,
-            "name": "so_1 20",
-            "match": {},
-            "keyword": "Given "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 16,
-            "name": "so_2 15 cucumbers",
-            "match": {},
-            "keyword": "When "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 17,
-            "name": "5 so_3",
-            "match": {},
-            "keyword": "Then "
-          }
-        ]
-      },
-      {
-        "line": 3,
-        "name": "",
-        "description": "",
-        "type": "background",
-        "keyword": "Background",
-        "steps": [
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 4,
-            "name": "bg_1",
-            "match": {},
-            "keyword": "Given "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 5,
-            "name": "bg_2",
-            "match": {},
-            "keyword": "When "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 6,
-            "name": "bg_3",
-            "match": {},
-            "keyword": "Then "
-          }
-        ]
-      },
-      {
-        "start_timestamp": "1970-01-01T00:01:35.018Z",
-        "before": [
-          {
-            "result": {
-              "duration": 1234000000,
-              "status": "passed"
-            },
-            "match": {}
-          }
-        ],
-        "line": 24,
-        "name": "Scenario_2",
-        "description": "",
-        "id": "feature-3;scenario-2",
-        "type": "scenario",
-        "keyword": "Scenario",
-        "steps": [
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 25,
-            "name": "a",
-            "match": {},
-            "keyword": "Given "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 26,
-            "name": "b",
-            "match": {},
-            "keyword": "Then "
-          },
-          {
-            "result": {
-              "status": "undefined"
-            },
-            "line": 27,
-            "name": "c",
-            "match": {},
-            "keyword": "When "
-          }
-        ]
-      }
-    ],
-    "name": "Feature_3",
-    "description": "",
-    "id": "feature-3",
-    "keyword": "Feature",
-    "uri": "classpath:io/cucumber/core/plugin/JSONPrettyFormatterTest.feature",
-    "tags": []
-  }
-]
diff --git a/examples/java-calculator-testng/src/test/java/io/cucumber/examples/testng/RunCucumberByCompositionTest.java b/examples/java-calculator-testng/src/test/java/io/cucumber/examples/testng/RunCucumberByCompositionTest.java
index 1749d99f08..5550a77082 100644
--- a/examples/java-calculator-testng/src/test/java/io/cucumber/examples/testng/RunCucumberByCompositionTest.java
+++ b/examples/java-calculator-testng/src/test/java/io/cucumber/examples/testng/RunCucumberByCompositionTest.java
@@ -14,7 +14,7 @@
  * AbstractTestNGCucumberTests but still executes each scenario as a separate
  * TestNG test.
  */
-@CucumberOptions(strict = true, plugin = "json:target/cucumber-report-feature-composite.json")
+@CucumberOptions(strict = true, plugin = "message:target/cucumber-report-feature-composite.ndjson")
 public class RunCucumberByCompositionTest extends RunCucumberByCompositionBase {
     private TestNGCucumberRunner testNGCucumberRunner;
 
diff --git a/examples/java-calculator-testng/src/test/java/io/cucumber/examples/testng/RunCucumberTest.java b/examples/java-calculator-testng/src/test/java/io/cucumber/examples/testng/RunCucumberTest.java
index 067a8f84c5..d17b40d009 100644
--- a/examples/java-calculator-testng/src/test/java/io/cucumber/examples/testng/RunCucumberTest.java
+++ b/examples/java-calculator-testng/src/test/java/io/cucumber/examples/testng/RunCucumberTest.java
@@ -4,7 +4,7 @@
 import io.cucumber.testng.CucumberOptions;
 import org.testng.annotations.DataProvider;
 
-@CucumberOptions(plugin = {"summary","json:target/cucumber-report.json"})
+@CucumberOptions(plugin = {"summary","message:target/cucumber-report.json"})
 public class RunCucumberTest extends AbstractTestNGCucumberTests {
 
     @DataProvider(parallel = true)
diff --git a/examples/java-calculator/pom.xml b/examples/java-calculator/pom.xml
index fecebac0d9..4f5ac3137c 100644
--- a/examples/java-calculator/pom.xml
+++ b/examples/java-calculator/pom.xml
@@ -22,6 +22,11 @@
             <artifactId>cucumber-java</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.cucumber</groupId>
+            <artifactId>cucumber-gherkin-messages</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-junit</artifactId>
diff --git a/examples/java-calculator/src/test/java/io/cucumber/examples/java/RunCucumberTest.java b/examples/java-calculator/src/test/java/io/cucumber/examples/java/RunCucumberTest.java
index 75b352a3fd..d48932996a 100644
--- a/examples/java-calculator/src/test/java/io/cucumber/examples/java/RunCucumberTest.java
+++ b/examples/java-calculator/src/test/java/io/cucumber/examples/java/RunCucumberTest.java
@@ -5,7 +5,7 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-@CucumberOptions(plugin = {"json:target/cucumber-report.json", "pretty"})
+@CucumberOptions(plugin = {"html:target/results.html", "message:target/results.ndjson"})
 public class RunCucumberTest {
 
 }
diff --git a/examples/java-calculator/src/test/resources/io/cucumber/examples/java/basic_arithmetic.feature b/examples/java-calculator/src/test/resources/io/cucumber/examples/java/basic_arithmetic.feature
index 9144af87f4..6ffef726c6 100644
--- a/examples/java-calculator/src/test/resources/io/cucumber/examples/java/basic_arithmetic.feature
+++ b/examples/java-calculator/src/test/resources/io/cucumber/examples/java/basic_arithmetic.feature
@@ -4,32 +4,32 @@ Feature: Basic Arithmetic
   Background: A Calculator
     Given a calculator I just turned on
 
-  Scenario: Addition
+    Scenario: Addition
   # Try to change one of the values below to provoke a failure
-    When I add 4 and 5
-    Then the result is 9
+      When I add 4 and 5
+      Then the result is 9
 
-  Scenario: Another Addition
+    Scenario: Another Addition
   # Try to change one of the values below to provoke a failure
-    When I add 4 and 7
-    Then the result is 11
+      When I add 4 and 7
+      Then the result is 11
 
-  Scenario Outline: Many additions
-    Given the previous entries:
-      | first | second | operation |
-      | 1     | 1      | +         |
-      | 2     | 1      | +         |
-    When I press +
-    And I add <a> and <b>
-    And I press +
-    Then the result is <c>
+    Scenario Outline: Many additions
+      Given the previous entries:
+        | first | second | operation |
+        | 1     | 1      | +         |
+        | 2     | 1      | +         |
+      When I press +
+      And I add <a> and <b>
+      And I press +
+      Then the result is <c>
 
-  Examples: Single digits
-    | a | b | c  |
-    | 1 | 2 | 8  |
-    | 2 | 3 | 10 |
+      Examples: Single digits
+        | a | b | c  |
+        | 1 | 2 | 8  |
+        | 2 | 3 | 10 |
 
-  Examples: Double digits
-    | a  | b  | c  |
-    | 10 | 20 | 35 |
-    | 20 | 30 | 55 |
+      Examples: Double digits
+        | a  | b  | c  |
+        | 10 | 20 | 35 |
+        | 20 | 30 | 55 |
diff --git a/examples/java8-calculator/src/test/java/io/cucumber/examples/java8/RunCucumberTest.java b/examples/java8-calculator/src/test/java/io/cucumber/examples/java8/RunCucumberTest.java
index ca2e72907f..663d9766ca 100644
--- a/examples/java8-calculator/src/test/java/io/cucumber/examples/java8/RunCucumberTest.java
+++ b/examples/java8-calculator/src/test/java/io/cucumber/examples/java8/RunCucumberTest.java
@@ -5,6 +5,6 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-@CucumberOptions(plugin = "json:target/cucumber-report.json")
+@CucumberOptions(plugin = "message:target/cucumber-report.ndjson")
 public class RunCucumberTest {
 }
diff --git a/gherkin-messages/pom.xml b/gherkin-messages/pom.xml
index b9954aa701..41eb3a4ef9 100644
--- a/gherkin-messages/pom.xml
+++ b/gherkin-messages/pom.xml
@@ -28,8 +28,9 @@
         </dependency>
 
         <dependency>
-            <groupId>io.cucumber</groupId>
-            <artifactId>messages</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesDocStringArgument.java b/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesDocStringArgument.java
index c818483aee..4d3d93dc63 100644
--- a/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesDocStringArgument.java
+++ b/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesDocStringArgument.java
@@ -20,7 +20,16 @@ public String getContent() {
 
     @Override
     public String getContentType() {
-        return docString.getMediaType();
+        return getMediaType();
+    }
+
+    @Override
+    public String getMediaType() {
+        String mediaType = docString.getMediaType();
+        if ("".equals(mediaType)) {
+            return null;
+        }
+        return mediaType;
     }
 
     @Override
diff --git a/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeature.java b/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeature.java
index 3b03400023..0815ad2792 100644
--- a/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeature.java
+++ b/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeature.java
@@ -94,6 +94,11 @@ public String getSource() {
         return gherkinSource;
     }
 
+    @Override
+    public Iterable<?> getParseEvents() {
+        return envelopes;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeatureParser.java b/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeatureParser.java
index 411b5dc69f..24ba4107ff 100644
--- a/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeatureParser.java
+++ b/gherkin-messages/src/main/java/io/cucumber/core/gherkin/messages/GherkinMessagesFeatureParser.java
@@ -7,13 +7,11 @@
 import io.cucumber.gherkin.Gherkin;
 import io.cucumber.gherkin.GherkinDialect;
 import io.cucumber.gherkin.GherkinDialectProvider;
-import io.cucumber.gherkin.ParserException;
 import io.cucumber.messages.Messages;
 import io.cucumber.messages.Messages.Envelope;
 import io.cucumber.messages.Messages.GherkinDocument;
 
 import java.net.URI;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -27,60 +25,63 @@ public final class GherkinMessagesFeatureParser implements FeatureParser {
 
     @Override
     public Optional<Feature> parse(URI path, String source, Supplier<UUID> idGenerator) {
-        try {
+        List<Envelope> sources = singletonList(
+            makeSourceEnvelope(source, path.toString())
+        );
 
-            List<Envelope> sources = singletonList(
-                makeSourceEnvelope(source, path.toString())
-            );
+        List<Envelope> envelopes = Gherkin.fromSources(
+            sources,
+            true,
+            true,
+            true,
+            () -> idGenerator.get().toString()
+        ).collect(toList());
 
-            List<Envelope> envelopes = Gherkin.fromSources(
-                sources,
-                true,
-                true,
-                true,
-                () -> idGenerator.get().toString()
-            ).collect(toList());
+        GherkinDocument gherkinDocument = envelopes.stream()
+            .filter(Envelope::hasGherkinDocument)
+            .map(Envelope::getGherkinDocument)
+            .findFirst()
+            .orElse(null);
 
-            GherkinDocument gherkinDocument = envelopes.stream()
-                .filter(Envelope::hasGherkinDocument)
-                .map(Envelope::getGherkinDocument)
-                .findFirst()
-                .orElse(null);
-
-            if (gherkinDocument == null || !gherkinDocument.hasFeature()) {
-                return Optional.empty();
+        if (gherkinDocument == null || !gherkinDocument.hasFeature()) {
+            List<String> errors = envelopes.stream()
+                .filter(Envelope::hasAttachment)
+                .map(Envelope::getAttachment)
+                .map(Messages.Attachment::getText)
+                .collect(toList());
+            if (!errors.isEmpty()) {
+                throw new FeatureParserException("Failed to parse resource at: " + path.toString() + "\n" + String.join("\n", errors));
             }
+            return Optional.empty();
+        }
 
-            CucumberQuery cucumberQuery = new CucumberQuery();
-            cucumberQuery.update(gherkinDocument);
-            GherkinDialectProvider dialectProvider = new GherkinDialectProvider();
-            String language = gherkinDocument.getFeature().getLanguage();
-            GherkinDialect dialect = dialectProvider.getDialect(language, null);
+        CucumberQuery cucumberQuery = new CucumberQuery();
+        cucumberQuery.update(gherkinDocument);
+        GherkinDialectProvider dialectProvider = new GherkinDialectProvider();
+        String language = gherkinDocument.getFeature().getLanguage();
+        GherkinDialect dialect = dialectProvider.getDialect(language, null);
 
-            List<Messages.Pickle> pickleMessages = envelopes.stream()
-                .filter(Envelope::hasPickle)
-                .map(Envelope::getPickle)
-                .collect(toList());
+        List<Messages.Pickle> pickleMessages = envelopes.stream()
+            .filter(Envelope::hasPickle)
+            .map(Envelope::getPickle)
+            .collect(toList());
 
-            if (pickleMessages.isEmpty()) {
-                return Optional.empty();
-            }
+        if (pickleMessages.isEmpty()) {
+            return Optional.empty();
+        }
 
-            List<Pickle> pickles = pickleMessages.stream()
-                .map(pickle -> new GherkinMessagesPickle(pickle, path, dialect, cucumberQuery))
-                .collect(toList());
+        List<Pickle> pickles = pickleMessages.stream()
+            .map(pickle -> new GherkinMessagesPickle(pickle, path, dialect, cucumberQuery))
+            .collect(toList());
 
-            GherkinMessagesFeature feature = new GherkinMessagesFeature(
-                gherkinDocument,
-                path,
-                source,
-                pickles,
-                envelopes
-            );
-            return Optional.of(feature);
-        } catch (ParserException e) {
-            throw new FeatureParserException("Failed to parse resource at: " + path.toString(), e);
-        }
+        GherkinMessagesFeature feature = new GherkinMessagesFeature(
+            gherkinDocument,
+            path,
+            source,
+            pickles,
+            envelopes
+        );
+        return Optional.of(feature);
     }
 
     @Override
diff --git a/gherkin-messages/src/test/java/io/cucumber/core/gherkin/messages/FeatureParserTest.java b/gherkin-messages/src/test/java/io/cucumber/core/gherkin/messages/FeatureParserTest.java
index 30d7a97e90..b1568f0360 100644
--- a/gherkin-messages/src/test/java/io/cucumber/core/gherkin/messages/FeatureParserTest.java
+++ b/gherkin-messages/src/test/java/io/cucumber/core/gherkin/messages/FeatureParserTest.java
@@ -1,7 +1,9 @@
 package io.cucumber.core.gherkin.messages;
 
 import io.cucumber.core.gherkin.DataTableArgument;
+import io.cucumber.core.gherkin.DocStringArgument;
 import io.cucumber.core.gherkin.Feature;
+import io.cucumber.core.gherkin.FeatureParserException;
 import io.cucumber.core.gherkin.Pickle;
 import io.cucumber.core.gherkin.Step;
 import org.junit.jupiter.api.Test;
@@ -9,12 +11,16 @@
 import java.io.IOException;
 import java.net.URI;
 import java.nio.file.Paths;
+import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
 import static java.nio.file.Files.readAllBytes;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class FeatureParserTest {
 
@@ -47,4 +53,34 @@ void empty_table_is_parsed() throws IOException {
         assertEquals(5, argument.getLine());
     }
 
+    @Test
+    void empty_doc_string_media_type_is_null() throws IOException {
+        URI uri = URI.create("classpath:com/example.feature");
+        String source = new String(readAllBytes(Paths.get("src/test/resources/io/cucumber/core/gherkin/messages/doc-string.feature")));
+        Feature feature = parser.parse(uri, source, UUID::randomUUID).get();
+        Pickle pickle = feature.getPickles().get(0);
+        List<Step> steps = pickle.getSteps();
+
+        assertAll(() -> {
+            assertNull(((DocStringArgument) steps.get(0).getArgument()).getContentType());
+            assertEquals("text/plain", ((DocStringArgument) steps.get(1).getArgument()).getContentType());
+        });
+    }
+
+    @Test
+    void lexer_error_throws_exception() throws IOException {
+        URI uri = URI.create("classpath:com/example.feature");
+        String source = new String(readAllBytes(Paths.get("src/test/resources/io/cucumber/core/gherkin/messages/lexer-error.feature")));
+        FeatureParserException exception = assertThrows(FeatureParserException.class, () -> parser.parse(uri, source, UUID::randomUUID));
+        assertEquals("" +
+                "Failed to parse resource at: classpath:com/example.feature\n" +
+                "(1:1): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Feature  FA'\n" +
+                "(3:3): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Scenario SA'\n" +
+                "(4:5): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Given GA'\n" +
+                "(5:5): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'When GA'\n" +
+                "(6:5): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Then TA'",
+            exception.getMessage()
+        );
+    }
+
 }
diff --git a/gherkin-messages/src/test/resources/META-INF/services/io.cucumber.core.backend.BackendProviderService b/gherkin-messages/src/test/resources/META-INF/services/io.cucumber.core.backend.BackendProviderService
new file mode 100644
index 0000000000..00e8fc283b
--- /dev/null
+++ b/gherkin-messages/src/test/resources/META-INF/services/io.cucumber.core.backend.BackendProviderService
@@ -0,0 +1 @@
+io.cucumber.core.gherkin.messages.StubBackendProviderService
diff --git a/gherkin-messages/src/test/resources/io/cucumber/core/gherkin/messages/doc-string.feature b/gherkin-messages/src/test/resources/io/cucumber/core/gherkin/messages/doc-string.feature
new file mode 100644
index 0000000000..f91cb06b60
--- /dev/null
+++ b/gherkin-messages/src/test/resources/io/cucumber/core/gherkin/messages/doc-string.feature
@@ -0,0 +1,11 @@
+Feature: Doc String
+
+  Scenario: This is valid Gherkin
+    Given an doc string
+      """
+      This doc string has no content type
+      """
+    Given an doc string with content type
+      """text/plain
+      This doc string has content a type
+      """
diff --git a/gherkin-messages/src/test/resources/io/cucumber/core/gherkin/messages/lexer-error.feature b/gherkin-messages/src/test/resources/io/cucumber/core/gherkin/messages/lexer-error.feature
new file mode 100644
index 0000000000..9527c2c33d
--- /dev/null
+++ b/gherkin-messages/src/test/resources/io/cucumber/core/gherkin/messages/lexer-error.feature
@@ -0,0 +1,6 @@
+Feature  FA
+
+  Scenario SA
+    Given GA
+    When GA
+    Then TA
\ No newline at end of file
diff --git a/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/GherkinVintageDocStringArgument.java b/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/GherkinVintageDocStringArgument.java
index 8bfb49b8d0..69610985e3 100644
--- a/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/GherkinVintageDocStringArgument.java
+++ b/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/GherkinVintageDocStringArgument.java
@@ -21,6 +21,11 @@ public String getContentType() {
         return docString.getContentType();
     }
 
+    @Override
+    public String getMediaType() {
+        return docString.getContentType();
+    }
+
     @Override
     public int getLine() {
         return docString.getLocation().getLine();
diff --git a/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/GherkinVintageFeature.java b/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/GherkinVintageFeature.java
index d91c107a1e..e12b43a4e7 100644
--- a/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/GherkinVintageFeature.java
+++ b/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/GherkinVintageFeature.java
@@ -15,6 +15,8 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import static java.util.Collections.emptyList;
+
 final class GherkinVintageFeature implements Feature {
     private final URI uri;
     private final List<Pickle> pickles;
@@ -86,6 +88,11 @@ public String getSource() {
         return gherkinSource;
     }
 
+    @Override
+    public Iterable<?> getParseEvents() {
+        return emptyList();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/core/src/main/java/io/cucumber/core/plugin/JSONFormatter.java b/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/JsonFormatter.java
similarity index 95%
rename from core/src/main/java/io/cucumber/core/plugin/JSONFormatter.java
rename to gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/JsonFormatter.java
index e1df5b1ee1..27745c7598 100644
--- a/core/src/main/java/io/cucumber/core/plugin/JSONFormatter.java
+++ b/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/JsonFormatter.java
@@ -1,4 +1,4 @@
-package io.cucumber.core.plugin;
+package io.cucumber.core.gherkin.vintage;
 
 import gherkin.ast.Background;
 import gherkin.ast.Feature;
@@ -27,9 +27,13 @@
 import io.cucumber.plugin.event.TestStepStarted;
 import io.cucumber.plugin.event.WriteEvent;
 
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URI;
+import java.nio.charset.StandardCharsets;
 import java.time.Instant;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
@@ -39,10 +43,9 @@
 import java.util.List;
 import java.util.Map;
 
-import static io.cucumber.core.plugin.TestSourcesModel.relativize;
 import static java.util.Locale.ROOT;
 
-public final class JSONFormatter implements EventListener {
+public final class JsonFormatter implements EventListener {
     private static final String before = "before";
     private static final String after = "after";
     private URI currentFeatureFile;
@@ -54,12 +57,12 @@ public final class JSONFormatter implements EventListener {
     private Map<String, Object> currentStepOrHookMap;
     private final Map<String, Object> currentBeforeStepHookList = new HashMap<>();
     private final Gson gson = new GsonBuilder().setPrettyPrinting().create();
-    private final NiceAppendable out;
+    private final OutputStreamWriter out;
     private final TestSourcesModel testSources = new TestSourcesModel();
 
     @SuppressWarnings("WeakerAccess") // Used by PluginFactory
-    public JSONFormatter(Appendable out) {
-        this.out = new NiceAppendable(out);
+    public JsonFormatter(OutputStream out) {
+        this.out = new OutputStreamWriter(out, StandardCharsets.UTF_8);
     }
 
     @Override
@@ -135,12 +138,16 @@ private void handleTestStepFinished(TestStepFinished event) {
 
     private void finishReport() {
         gson.toJson(featureMaps, out);
-        out.close();
+        try {
+            out.close();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
     }
 
     private Map<String, Object> createFeatureMap(TestCase testCase) {
         Map<String, Object> featureMap = new HashMap<>();
-        featureMap.put("uri", relativize(testCase.getUri()));
+        featureMap.put("uri", TestSourcesModel.relativize(testCase.getUri()));
         featureMap.put("elements", new ArrayList<Map<String, Object>>());
         Feature feature = testSources.getFeature(testCase.getUri());
         if (feature != null) {
@@ -236,7 +243,7 @@ private Map<String, Object> createDocStringMap(DocStringArgument docString) {
         Map<String, Object> docStringMap = new HashMap<>();
         docStringMap.put("value", docString.getContent());
         docStringMap.put("line", docString.getLine());
-        docStringMap.put("content_type", docString.getContentType());
+        docStringMap.put("content_type", docString.getMediaType());
         return docStringMap;
     }
 
diff --git a/core/src/main/java/io/cucumber/core/plugin/TestSourcesModel.java b/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/TestSourcesModel.java
similarity index 98%
rename from core/src/main/java/io/cucumber/core/plugin/TestSourcesModel.java
rename to gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/TestSourcesModel.java
index 0cc21506b0..6b246bd01a 100644
--- a/core/src/main/java/io/cucumber/core/plugin/TestSourcesModel.java
+++ b/gherkin-vintage/src/main/java/io/cucumber/core/gherkin/vintage/TestSourcesModel.java
@@ -1,4 +1,4 @@
-package io.cucumber.core.plugin;
+package io.cucumber.core.gherkin.vintage;
 
 import gherkin.AstBuilder;
 import gherkin.Parser;
@@ -13,7 +13,6 @@
 import gherkin.ast.ScenarioOutline;
 import gherkin.ast.Step;
 import gherkin.ast.TableRow;
-import io.cucumber.core.exception.CucumberException;
 import io.cucumber.plugin.event.TestSourceRead;
 
 import java.io.File;
@@ -153,7 +152,7 @@ private void parseGherkinSource(URI path) {
             // parsing. So if we couldn't parse the feature, it will throw
             // before emitting the event. So if we can't parse it now, it was
             // not parsed by the Gherkin 5 parser.
-            throw new CucumberException("" +
+            throw new RuntimeException("" +
                 "You are using a plugin that does not support Gherkin 8+.\n" +
                 "Try to remove the html and/or json formatters. See the\n" +
                 "Cucumber-JVM 5.0.0 release announcement for more information.",
diff --git a/gherkin/src/main/java/io/cucumber/core/gherkin/DataTableArgument.java b/gherkin/src/main/java/io/cucumber/core/gherkin/DataTableArgument.java
index 3c239fdbe1..ac39909374 100644
--- a/gherkin/src/main/java/io/cucumber/core/gherkin/DataTableArgument.java
+++ b/gherkin/src/main/java/io/cucumber/core/gherkin/DataTableArgument.java
@@ -3,7 +3,9 @@
 import java.util.List;
 
 public interface DataTableArgument extends Argument, io.cucumber.plugin.event.DataTableArgument {
+    @Override
     List<List<String>> cells();
 
+    @Override
     int getLine();
 }
diff --git a/gherkin/src/main/java/io/cucumber/core/gherkin/DocStringArgument.java b/gherkin/src/main/java/io/cucumber/core/gherkin/DocStringArgument.java
index 6a4ecfaa98..cf8b30eb08 100644
--- a/gherkin/src/main/java/io/cucumber/core/gherkin/DocStringArgument.java
+++ b/gherkin/src/main/java/io/cucumber/core/gherkin/DocStringArgument.java
@@ -1,9 +1,15 @@
 package io.cucumber.core.gherkin;
 
 public interface DocStringArgument extends Argument, io.cucumber.plugin.event.DocStringArgument {
+    @Override
     String getContent();
 
+    @Override
     String getContentType();
 
+    @Override
+    String getMediaType();
+
+    @Override
     int getLine();
 }
diff --git a/gherkin/src/main/java/io/cucumber/core/gherkin/Feature.java b/gherkin/src/main/java/io/cucumber/core/gherkin/Feature.java
index 4aee75b7e2..51055b3da2 100644
--- a/gherkin/src/main/java/io/cucumber/core/gherkin/Feature.java
+++ b/gherkin/src/main/java/io/cucumber/core/gherkin/Feature.java
@@ -16,4 +16,5 @@ public interface Feature extends Node, Container<Node> {
 
     String getSource();
 
+    Iterable<?> getParseEvents();
 }
diff --git a/gherkin/src/main/java/io/cucumber/core/gherkin/Step.java b/gherkin/src/main/java/io/cucumber/core/gherkin/Step.java
index 665b0972f3..bb71514888 100644
--- a/gherkin/src/main/java/io/cucumber/core/gherkin/Step.java
+++ b/gherkin/src/main/java/io/cucumber/core/gherkin/Step.java
@@ -1,17 +1,20 @@
 package io.cucumber.core.gherkin;
 
 public interface Step extends io.cucumber.plugin.event.Step {
-
+    @Override
     int getLine();
 
+    @Override
     Argument getArgument();
 
+    @Override
     String getKeyWord();
 
     StepType getType();
 
     String getPreviousGivenWhenThenKeyWord();
 
+    @Override
     String getText();
 
     String getId();
diff --git a/java/src/main/java/io/cucumber/java/ParameterType.java b/java/src/main/java/io/cucumber/java/ParameterType.java
index 53732303d2..6ea8dfc77a 100644
--- a/java/src/main/java/io/cucumber/java/ParameterType.java
+++ b/java/src/main/java/io/cucumber/java/ParameterType.java
@@ -1,7 +1,6 @@
 package io.cucumber.java;
 
 import io.cucumber.cucumberexpressions.GeneratedExpression;
-import io.cucumber.cucumberexpressions.RegularExpression;
 import org.apiguardian.api.API;
 
 import java.lang.annotation.ElementType;
@@ -58,7 +57,7 @@
 
     /**
      * Indicates whether or not this is a preferential parameter type when matching text
-     * against a {@link RegularExpression}. In case there are multiple parameter types
+     * against a RegularExpression. In case there are multiple parameter types
      * with a regexp identical to the capture group's regexp, a preferential parameter type will
      * win. If there are more than 1 preferential ones, an error will be thrown.
      *
diff --git a/junit-platform-engine/pom.xml b/junit-platform-engine/pom.xml
index c624c37006..6dd3ef4eed 100644
--- a/junit-platform-engine/pom.xml
+++ b/junit-platform-engine/pom.xml
@@ -11,45 +11,23 @@
     <packaging>jar</packaging>
     <name>Cucumber-JVM: JUnit Platform Engine</name>
 
-    <profiles>
-        <profile>
-            <!-- IDEA doesn't calculate shaded dependencies correctly and tries
-                 to include both gherkin 5 and gherkin 8. Manually excluded here
-                 for development -->
-            <id>idea-exclude-gherkin-vintage</id>
-            <dependencies>
-                <dependency>
-                    <groupId>io.cucumber</groupId>
-                    <artifactId>cucumber-core</artifactId>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>io.cucumber</groupId>
-                            <artifactId>gherkin</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>io.cucumber</groupId>
-                            <artifactId>cucumber-gherkin-vintage</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
-
     <dependencies>
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.junit.platform</groupId>
             <artifactId>junit-platform-engine</artifactId>
         </dependency>
+
         <dependency>
             <groupId>io.cucumber</groupId>
             <artifactId>cucumber-gherkin-messages</artifactId>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-core</artifactId>
diff --git a/junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/CucumberEngineExecutionContext.java b/junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/CucumberEngineExecutionContext.java
index 9569b60e61..01a6e5f126 100644
--- a/junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/CucumberEngineExecutionContext.java
+++ b/junit-platform-engine/src/main/java/io/cucumber/junit/platform/engine/CucumberEngineExecutionContext.java
@@ -18,6 +18,7 @@
 import io.cucumber.core.runtime.ThreadLocalRunnerSupplier;
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.cucumber.core.runtime.TypeRegistryConfigurerSupplier;
+import io.cucumber.messages.Messages;
 import io.cucumber.plugin.event.TestRunFinished;
 import io.cucumber.plugin.event.TestRunStarted;
 import io.cucumber.plugin.event.TestSourceRead;
@@ -28,8 +29,10 @@
 import org.junit.platform.engine.support.hierarchical.EngineExecutionContext;
 
 import java.time.Clock;
+import java.time.Instant;
 import java.util.UUID;
 import java.util.function.Supplier;
+import static io.cucumber.messages.TimeConversion.javaInstantToTimestamp;
 
 @API(status = API.Status.STABLE)
 public final class CucumberEngineExecutionContext implements EngineExecutionContext {
@@ -68,13 +71,21 @@ CucumberEngineOptions getOptions() {
 
     void startTestRun() {
         logger.debug(() -> "Sending run test started event");
-        bus.send(new TestRunStarted(bus.getInstant()));
+        Instant instant = bus.getInstant();
+        bus.send(new TestRunStarted(instant));
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestRunStarted(Messages.TestRunStarted.newBuilder()
+                .setTimestamp(javaInstantToTimestamp(instant)))
+            .build()
+        );
     }
 
     void beforeFeature(Feature feature) {
         logger.debug(() -> "Sending test source read event for " + feature.getUri());
         // Invoked concurrently.
-        getRunner().getBus().send(new TestSourceRead(bus.getInstant(), feature.getUri(), feature.getSource()));
+        EventBus bus = getRunner().getBus();
+        bus.send(new TestSourceRead(bus.getInstant(), feature.getUri(), feature.getSource()));
+        bus.sendAll(feature.getParseEvents());
     }
 
     void runTestCase(Pickle pickle) {
@@ -89,7 +100,12 @@ void runTestCase(Pickle pickle) {
 
     void finishTestRun() {
         logger.debug(() -> "Sending test run finished event");
-        bus.send(new TestRunFinished(bus.getInstant()));
+        Instant instant = bus.getInstant();
+        bus.send(new TestRunFinished(instant));
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestRunFinished(Messages.TestRunFinished.newBuilder()
+                .setTimestamp(javaInstantToTimestamp(instant)))
+            .build());
     }
 
     private Runner getRunner() {
diff --git a/junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberEngineOptionsTest.java b/junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberEngineOptionsTest.java
index 288d850f60..1640ba28d3 100644
--- a/junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberEngineOptionsTest.java
+++ b/junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/CucumberEngineOptionsTest.java
@@ -30,10 +30,10 @@ void getPluginNames() {
         );
 
         CucumberEngineOptions htmlAndJson = new CucumberEngineOptions(
-            new MapConfigurationParameters(Constants.PLUGIN_PROPERTY_NAME, "html:path/with spaces/to/report.html, json:path/with spaces/to/report.json")
+            new MapConfigurationParameters(Constants.PLUGIN_PROPERTY_NAME, "html:path/with spaces/to/report.html, message:path/with spaces/to/report.ndjson")
         );
         assertEquals(
-            asList("html:path/with spaces/to/report.html", "json:path/with spaces/to/report.json"),
+            asList("html:path/with spaces/to/report.html", "message:path/with spaces/to/report.ndjson"),
             htmlAndJson.plugins().stream()
                 .map(Options.Plugin::pluginString)
                 .collect(toList())
diff --git a/junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/TestCaseResultObserverTest.java b/junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/TestCaseResultObserverTest.java
index 2191bb4fdd..926df09fb0 100644
--- a/junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/TestCaseResultObserverTest.java
+++ b/junit-platform-engine/src/test/java/io/cucumber/junit/platform/engine/TestCaseResultObserverTest.java
@@ -141,6 +141,12 @@ public String getStepText() {
         public String getCodeLocation() {
             return null;
         }
+
+        @Override
+        public UUID getId() {
+            return UUID.randomUUID();
+        }
+
     };
 
     @Test
diff --git a/junit/README.md b/junit/README.md
index 74093b6568..1929d5d3b1 100644
--- a/junit/README.md
+++ b/junit/README.md
@@ -27,7 +27,7 @@ import io.cucumber.junit.Cucumber;
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-@CucumberOptions(plugin = "json:target/cucumber-report.json")
+@CucumberOptions(plugin = "message:target/cucumber-report.ndjson")
 public class RunCucumberTest {
 }
 ```
diff --git a/junit/src/main/java/io/cucumber/junit/Cucumber.java b/junit/src/main/java/io/cucumber/junit/Cucumber.java
index 0606ac87ee..31df5479ec 100644
--- a/junit/src/main/java/io/cucumber/junit/Cucumber.java
+++ b/junit/src/main/java/io/cucumber/junit/Cucumber.java
@@ -25,6 +25,7 @@
 import io.cucumber.core.runtime.ThreadLocalRunnerSupplier;
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.cucumber.core.runtime.TypeRegistryConfigurerSupplier;
+import io.cucumber.messages.Messages;
 import io.cucumber.plugin.event.TestRunFinished;
 import io.cucumber.plugin.event.TestRunStarted;
 import io.cucumber.plugin.event.TestSourceRead;
@@ -40,11 +41,13 @@
 import org.junit.runners.model.Statement;
 
 import java.time.Clock;
+import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import static io.cucumber.messages.TimeConversion.javaInstantToTimestamp;
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -212,13 +215,36 @@ public void evaluate() throws Throwable {
                 plugins.setEventBusOnEventListenerPlugins(bus);
             }
 
-            bus.send(new TestRunStarted(bus.getInstant()));
+            emitTestRunStarted();
             for (Feature feature : features) {
-                bus.send(new TestSourceRead(bus.getInstant(), feature.getUri(), feature.getSource()));
+                emitTestSource(feature);
             }
             runFeatures.evaluate();
-            bus.send(new TestRunFinished(bus.getInstant()));
+            emitTestRunFinished();
         }
 
+        private void emitTestRunStarted() {
+            Instant instant = bus.getInstant();
+            bus.send(new TestRunStarted(instant));
+            bus.send(Messages.Envelope.newBuilder()
+                .setTestRunStarted(Messages.TestRunStarted.newBuilder()
+                    .setTimestamp(javaInstantToTimestamp(instant)))
+                .build());
+        }
+
+        private void emitTestSource(Feature feature){
+            bus.send(new TestSourceRead(bus.getInstant(), feature.getUri(), feature.getSource()));
+            bus.sendAll(feature.getParseEvents());
+        }
+
+        private void emitTestRunFinished() {
+            Instant instant = bus.getInstant();
+            bus.send(new TestRunFinished(instant));
+            bus.send(Messages.Envelope.newBuilder()
+                .setTestRunFinished(Messages.TestRunFinished.newBuilder()
+                    .setTimestamp(javaInstantToTimestamp(instant)))
+                .build());
+        }
     }
+
 }
diff --git a/junit/src/test/java/io/cucumber/junit/CucumberTest.java b/junit/src/test/java/io/cucumber/junit/CucumberTest.java
index ea76ad844f..741ac4b8ff 100644
--- a/junit/src/test/java/io/cucumber/junit/CucumberTest.java
+++ b/junit/src/test/java/io/cucumber/junit/CucumberTest.java
@@ -28,7 +28,6 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.argThat;
@@ -69,10 +68,15 @@ void finds_features_based_on_explicit_root_package() throws InitializationError
     void testThatParsingErrorsIsNicelyReported() {
         Executable testMethod = () -> new Cucumber(LexerErrorFeature.class);
         FeatureParserException actualThrown = assertThrows(FeatureParserException.class, testMethod);
-        assertAll("Checking Exception including cause",
-            () -> assertThat(
-                actualThrown.getMessage(),
-                is(equalTo("Failed to parse resource at: classpath:io/cucumber/error/lexer_error.feature"))
+        assertThat(
+            actualThrown.getMessage(),
+            equalTo("" +
+                "Failed to parse resource at: classpath:io/cucumber/error/lexer_error.feature\n" +
+                "(1:1): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Feature  FA'\n" +
+                "(3:3): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Scenario SA'\n" +
+                "(4:5): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Given GA'\n" +
+                "(5:5): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'When GA'\n" +
+                "(6:5): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Then TA'"
             )
         );
     }
@@ -83,7 +87,7 @@ void testThatFileIsNotCreatedOnParsingError() {
             () -> new Cucumber(FormatterWithLexerErrorFeature.class)
         );
         assertFalse(
-            new File("target/lexor_error_feature.json").exists(),
+            new File("target/lexor_error_feature.ndjson").exists(),
             "File is created despite Lexor Error"
         );
     }
@@ -189,7 +193,7 @@ public static class LexerErrorFeature {
     }
 
     @SuppressWarnings("WeakerAccess")
-    @CucumberOptions(features = {"classpath:io/cucumber/error/lexer_error.feature"}, plugin = {"json:target/lexor_error_feature.json"})
+    @CucumberOptions(features = {"classpath:io/cucumber/error/lexer_error.feature"}, plugin = {"message:target/lexor_error_feature.ndjson"})
     public static class FormatterWithLexerErrorFeature {
 
     }
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/Argument.java b/plugin/src/main/java/io/cucumber/plugin/event/Argument.java
index ab0eb0a282..09ee54ebf8 100644
--- a/plugin/src/main/java/io/cucumber/plugin/event/Argument.java
+++ b/plugin/src/main/java/io/cucumber/plugin/event/Argument.java
@@ -12,9 +12,14 @@
  */
 @API(status = API.Status.STABLE)
 public interface Argument {
+
+    String getParameterTypeName();
+
     String getValue();
 
     int getStart();
 
     int getEnd();
+
+    Group getGroup();
 }
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/DocStringArgument.java b/plugin/src/main/java/io/cucumber/plugin/event/DocStringArgument.java
index 29b732d7c4..9b908349e6 100644
--- a/plugin/src/main/java/io/cucumber/plugin/event/DocStringArgument.java
+++ b/plugin/src/main/java/io/cucumber/plugin/event/DocStringArgument.java
@@ -9,7 +9,14 @@
 public interface DocStringArgument extends StepArgument {
     String getContent();
 
+    /**
+     *
+     * @deprecated use {@link #getMediaType()} instead.
+     */
+    @Deprecated
     String getContentType();
 
+    String getMediaType();
+
     int getLine();
 }
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/EmbedEvent.java b/plugin/src/main/java/io/cucumber/plugin/event/EmbedEvent.java
index fded44de23..3592f9f5f5 100644
--- a/plugin/src/main/java/io/cucumber/plugin/event/EmbedEvent.java
+++ b/plugin/src/main/java/io/cucumber/plugin/event/EmbedEvent.java
@@ -3,7 +3,8 @@
 import org.apiguardian.api.API;
 
 import java.time.Instant;
-import java.util.Objects;
+
+import static java.util.Objects.requireNonNull;
 
 @API(status = API.Status.STABLE)
 public final class EmbedEvent extends TestCaseEvent {
@@ -12,16 +13,13 @@ public final class EmbedEvent extends TestCaseEvent {
     public final String name;
 
     public EmbedEvent(Instant timeInstant, TestCase testCase, byte[] data, String mediaType) {
-        super(timeInstant, testCase);
-        this.data = Objects.requireNonNull(data);
-        this.mediaType = Objects.requireNonNull(mediaType);
-        this.name = null;
+        this(timeInstant, testCase, data, mediaType, null);
     }
 
     public EmbedEvent(Instant timeInstant, TestCase testCase, byte[] data, String mediaType, String name) {
         super(timeInstant, testCase);
-        this.data = data;
-        this.mediaType = mediaType;
+        this.data = requireNonNull(data);
+        this.mediaType = requireNonNull(mediaType);
         this.name = name;
     }
 
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/EventHandler.java b/plugin/src/main/java/io/cucumber/plugin/event/EventHandler.java
index d114642b0c..2a6ba8ff4a 100644
--- a/plugin/src/main/java/io/cucumber/plugin/event/EventHandler.java
+++ b/plugin/src/main/java/io/cucumber/plugin/event/EventHandler.java
@@ -3,7 +3,7 @@
 import org.apiguardian.api.API;
 
 @API(status = API.Status.STABLE)
-public interface EventHandler<T extends Event> {
+public interface EventHandler<T> {
 
     void receive(T event);
 
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/EventPublisher.java b/plugin/src/main/java/io/cucumber/plugin/event/EventPublisher.java
index 76495210ad..87a2e59e32 100644
--- a/plugin/src/main/java/io/cucumber/plugin/event/EventPublisher.java
+++ b/plugin/src/main/java/io/cucumber/plugin/event/EventPublisher.java
@@ -29,7 +29,7 @@ public interface EventPublisher {
      * @param <T>       the event type
      * @see Event
      */
-    <T extends Event> void registerHandlerFor(Class<T> eventType, EventHandler<T> handler);
+    <T> void registerHandlerFor(Class<T> eventType, EventHandler<T> handler);
 
     /**
      * Unregister an event handler for a specific event
@@ -38,6 +38,6 @@ public interface EventPublisher {
      * @param handler   the event handler
      * @param <T>       the event type
      */
-    <T extends Event> void removeHandlerFor(Class<T> eventType, EventHandler<T> handler);
+    <T> void removeHandlerFor(Class<T> eventType, EventHandler<T> handler);
 
 }
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/Group.java b/plugin/src/main/java/io/cucumber/plugin/event/Group.java
new file mode 100644
index 0000000000..0df2dd5665
--- /dev/null
+++ b/plugin/src/main/java/io/cucumber/plugin/event/Group.java
@@ -0,0 +1,17 @@
+package io.cucumber.plugin.event;
+
+import java.util.Collection;
+
+/**
+ * A capture group in a Regular or Cucumber Expression.
+ */
+public interface Group {
+
+    Collection<Group> getChildren();
+
+    String getValue();
+
+    int getStart();
+
+    int getEnd();
+}
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/HookTestStep.java b/plugin/src/main/java/io/cucumber/plugin/event/HookTestStep.java
index 7211a04c06..27e74ed94d 100644
--- a/plugin/src/main/java/io/cucumber/plugin/event/HookTestStep.java
+++ b/plugin/src/main/java/io/cucumber/plugin/event/HookTestStep.java
@@ -18,5 +18,4 @@ public interface HookTestStep extends TestStep {
      * @return the hook type.
      */
     HookType getHookType();
-
 }
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/TestCaseStarted.java b/plugin/src/main/java/io/cucumber/plugin/event/TestCaseStarted.java
index 607b498b0a..d6832371f0 100644
--- a/plugin/src/main/java/io/cucumber/plugin/event/TestCaseStarted.java
+++ b/plugin/src/main/java/io/cucumber/plugin/event/TestCaseStarted.java
@@ -4,6 +4,7 @@
 
 import java.time.Instant;
 import java.util.Objects;
+import java.util.UUID;
 
 @API(status = API.Status.STABLE)
 public final class TestCaseStarted extends TestCaseEvent {
@@ -12,7 +13,7 @@ public final class TestCaseStarted extends TestCaseEvent {
     public TestCaseStarted(Instant timeInstant, TestCase testCase) {
       super(timeInstant, testCase);
       this.testCase = Objects.requireNonNull(testCase);
-  }
+    }
 
     @Override
     public TestCase getTestCase() {
diff --git a/plugin/src/main/java/io/cucumber/plugin/event/TestStep.java b/plugin/src/main/java/io/cucumber/plugin/event/TestStep.java
index 156635a679..20e2a4cbec 100644
--- a/plugin/src/main/java/io/cucumber/plugin/event/TestStep.java
+++ b/plugin/src/main/java/io/cucumber/plugin/event/TestStep.java
@@ -2,6 +2,8 @@
 
 import org.apiguardian.api.API;
 
+import java.util.UUID;
+
 /**
  * A test step can either represent the execution of a hook
  * or a pickle step. Each step is tied to some glue code.
@@ -20,5 +22,6 @@ public interface TestStep {
      */
     String getCodeLocation();
 
+    UUID getId();
 
 }
diff --git a/pom.xml b/pom.xml
index dca8131302..d42997472e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,13 +48,14 @@
         <apiguardian-api.version>1.1.0</apiguardian-api.version>
 
         <!--Dependencies -->
-        <cucumber-expressions.version>8.3.1</cucumber-expressions.version>
+        <cucumber-expressions.version>9.0.0</cucumber-expressions.version>
         <datatable.version>3.3.0</datatable.version>
         <tag-expressions.version>2.0.4</tag-expressions.version>
-        <messages.version>9.0.3</messages.version>
+        <messages.version>10.0.3</messages.version>
         <gherkin-vintage.version>5.2.0</gherkin-vintage.version>
         <gherkin-vintage-jvm-deps.version>1.0.6</gherkin-vintage-jvm-deps.version>
-        <gherkin-messages.version>9.1.0</gherkin-messages.version>
+        <gherkin-messages.version>11.0.0</gherkin-messages.version>
+        <html-formatter.version>4.3.0</html-formatter.version>
 
         <!--Test Dependencies-->
         <junit.version>4.13</junit.version>
@@ -89,6 +90,11 @@
                 <artifactId>cucumber-expressions</artifactId>
                 <version>${cucumber-expressions.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.cucumber</groupId>
+                <artifactId>html-formatter</artifactId>
+                <version>${html-formatter.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.cucumber</groupId>
                 <artifactId>datatable</artifactId>
@@ -368,6 +374,12 @@
                             <artifactId>gherkin</artifactId>
                             <version>${gherkin-messages.version}</version>
                         </dependency>
+                        <!-- TODO: Gherkin 11.0.0 is broken because messages 10.0.2 doesn't exist-->
+                        <dependency>
+                            <groupId>io.cucumber</groupId>
+                            <artifactId>messages</artifactId>
+                            <version>${messages.version}</version>
+                        </dependency>
                     </dependencies>
                 </plugin>
 
diff --git a/testng/README.md b/testng/README.md
index 00c5005af6..3399445e30 100644
--- a/testng/README.md
+++ b/testng/README.md
@@ -24,7 +24,7 @@ package io.cucumber.runtime.testng;
 import io.cucumber.testng.AbstractTestNGCucumberTests;
 import io.cucumber.testng.CucumberOptions;
 
-@CucumberOptions(plugin = "json:target/cucumber-report.json")
+@CucumberOptions(plugin = "message:target/cucumber-report.ndjson")
 public class RunCucumberTest extends AbstractTestNGCucumberTests {
 }
 ```
diff --git a/testng/src/main/java/io/cucumber/testng/TestNGCucumberRunner.java b/testng/src/main/java/io/cucumber/testng/TestNGCucumberRunner.java
index 0eedcc2f49..c210c56e35 100644
--- a/testng/src/main/java/io/cucumber/testng/TestNGCucumberRunner.java
+++ b/testng/src/main/java/io/cucumber/testng/TestNGCucumberRunner.java
@@ -26,17 +26,21 @@
 import io.cucumber.core.runtime.ThreadLocalRunnerSupplier;
 import io.cucumber.core.runtime.TimeServiceEventBus;
 import io.cucumber.core.runtime.TypeRegistryConfigurerSupplier;
+import io.cucumber.messages.Messages;
 import io.cucumber.plugin.event.TestRunFinished;
 import io.cucumber.plugin.event.TestRunStarted;
 import io.cucumber.plugin.event.TestSourceRead;
 import org.apiguardian.api.API;
 
 import java.time.Clock;
+import java.time.Instant;
+import java.time.Instant;
 import java.util.List;
 import java.util.UUID;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
 
+import static io.cucumber.messages.TimeConversion.javaInstantToTimestamp;
 import static java.util.stream.Collectors.toList;
 
 /**
@@ -112,8 +116,8 @@ public TestNGCucumberRunner(Class<?> clazz) {
         // Start test execution now.
         plugins.setSerialEventBusOnEventListenerPlugins(bus);
         features = featureSupplier.get();
-        bus.send(new TestRunStarted(bus.getInstant()));
-        features.forEach(feature -> bus.send(new TestSourceRead(bus.getInstant(), feature.getUri(), feature.getSource())));
+        emitTestRunStarted();
+        features.forEach(this::emitTestSource);
     }
 
     public void runScenario(io.cucumber.testng.Pickle pickle) throws Throwable {
@@ -130,7 +134,7 @@ public void runScenario(io.cucumber.testng.Pickle pickle) throws Throwable {
      * Finishes test execution by Cucumber.
      */
     public void finish() {
-        bus.send(new TestRunFinished(bus.getInstant()));
+        emitTestRunFinished();
     }
 
     /**
@@ -153,4 +157,27 @@ public Object[][] provideScenarios() {
             return new Object[][]{new Object[]{new CucumberExceptionWrapper(e), null}};
         }
     }
+
+    private void emitTestRunStarted() {
+        Instant instant = bus.getInstant();
+        bus.send(new TestRunStarted(instant));
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestRunStarted(Messages.TestRunStarted.newBuilder()
+                .setTimestamp(javaInstantToTimestamp(instant)))
+            .build());
+    }
+
+    private void emitTestSource(Feature feature) {
+        bus.send(new TestSourceRead(bus.getInstant(), feature.getUri(), feature.getSource()));
+        bus.sendAll(feature.getParseEvents());
+    }
+
+    private void emitTestRunFinished() {
+        Instant instant = bus.getInstant();
+        bus.send(new TestRunFinished(instant));
+        bus.send(Messages.Envelope.newBuilder()
+            .setTestRunFinished(Messages.TestRunFinished.newBuilder()
+                .setTimestamp(javaInstantToTimestamp(instant)))
+            .build());
+    }
 }
diff --git a/testng/src/test/java/io/cucumber/testng/TestNGCucumberRunnerTest.java b/testng/src/test/java/io/cucumber/testng/TestNGCucumberRunnerTest.java
index 03dccc9e33..6660166ffd 100644
--- a/testng/src/test/java/io/cucumber/testng/TestNGCucumberRunnerTest.java
+++ b/testng/src/test/java/io/cucumber/testng/TestNGCucumberRunnerTest.java
@@ -52,7 +52,10 @@ public void parse_error_propagated_to_testng_test_execution() {
             testNGCucumberRunner = new TestNGCucumberRunner(ParseError.class);
             Assert.fail("CucumberException not thrown");
         } catch (FeatureParserException e) {
-            assertEquals(e.getMessage(), "Failed to parse resource at: classpath:io/cucumber/error/parse-error.feature");
+            assertEquals(e.getMessage(),
+                "Failed to parse resource at: classpath:io/cucumber/error/parse-error.feature\n" +
+                    "(1:1): expected: #EOF, #Language, #TagLine, #FeatureLine, #Comment, #Empty, got 'Invalid syntax'"
+            );
         }
     }