diff --git a/docs/src/docs/asciidoc/end-to-end-gradle-guide.adoc b/docs/src/docs/asciidoc/end-to-end-gradle-guide.adoc
index 26a7f2c6..d1427373 100644
--- a/docs/src/docs/asciidoc/end-to-end-gradle-guide.adoc
+++ b/docs/src/docs/asciidoc/end-to-end-gradle-guide.adoc
@@ -6,6 +6,7 @@ The GraalVM team
 This guide leads you through the process of integrating Native Gradle Plugin with your project.
 It starts from adding the plugin to your project, goes through some of the main functionalities that you may use (like collecting the metadata),
 all the way to some diagnostics tools that you can use to analyse native executables you have made.
+You can see an example of tests on which we tested whole guide <<example,here>>.
 
 In case you only want to see how a simple application works in practise, you can check <<quickstart-gradle-plugin.adoc#,our demo>>.
 
@@ -178,10 +179,10 @@ Inside these blocks you can pass the following options:
 - `jvmArgs` - Passes the given argument directly to the JVM running the native image builder
 - `useFatJar` - Instead of passing each jar individually, builds a fat jar
 
-You can also pass **build-time** and **run-time** options to the Native Image using:
+You can also pass **build-time** and **run-time** arguments:
 
-- `buildArgs.add('<buildArg>')` - You can find more about possible build arguments https://www.graalvm.org/latest/reference-manual/native-image/overview/BuildConfiguration/[here]
-- `runtimeArgs.add('<runtimeArg>')` - You can find more about possible runtime arguments https://www.graalvm.org/latest/reference-manual/native-image/overview/Options/[here]
+- `buildArgs.add('<buildArg>')` - You can find more about possible build arguments https://www.graalvm.org/latest/reference-manual/native-image/overview/Options/[here] and https://www.graalvm.org/latest/reference-manual/native-image/overview/BuildConfiguration/[here]
+- `runtimeArgs.add('<runtimeArg>')` - Runtime arguments consumed by your application
 
 Here is an example of additional options usage:
 
@@ -258,9 +259,9 @@ The easiest way how this information can be passed to the Native Image is throug
 a single `reachability-metadata.json` file (for newer GraalVM versions) or multiple json files (`reflect-config.json`, `resource-config.json`, `proxy-config.json`, `serialization-config.json`, `jni-config.json`).
 To learn more about metadata that Native Image consumes, https://www.graalvm.org/latest/reference-manual/native-image/metadata/[see this].
 
-For example, if you run the test that tries to load resource `resource.txt`, and you don't have entry for that resource in the metadata config file, the resource can't be loaded (will be null).
+For example, if you run the test that uses the reflection, and you don't have entry for that reflection call in the metadata config file, your test will fail.
 
-To make your test/application work while using resources (like in this example) or other metadata, you should either generate metadata configurations or write them manually.
+To make your test/application work while using reflection (like in this example) or other metadata, you should either generate metadata configurations or write them manually.
 To generate metadata automatically, you can run your tests (or the main application) with the Native Image Agent, that will collect all the metadata your test/application require.
 To enable the agent (through Native Gradle Plugin) you should either:
 
@@ -291,8 +292,6 @@ agent {
 [.underline]#To generate the metadata file(s) for your `application` just run:#
 
 - `./gradlew run` if you added the agent block to the configuration or `./gradlew -Pagent run` if you didn't. This command runs on JVM with native-image-agent and collects the metadata.
-- `./gradlew nativeRun` if you added the agent block to the configuration or `./gradlew -Pagent nativeRun` if you didn't. This command runs on JVM with the native-image agent, collects the metadata and uses it for testing on native-image.
-
 
 [WARNING]
 ====
@@ -380,7 +379,7 @@ Besides that, you can configure `metadataCopy` task through the command line as
 
 Here is an example of a valid `metadataCopy` usage:
 
-[source,bash,subs="verbatim,attributes"]
+[source,bash,subs="verbatim,attributes", role="multi-language-sample"]
 ----
 ./gradlew metadataCopy --task test --dir resources/META-INF/native-image/org.example
 ----
@@ -414,9 +413,9 @@ First thing that you can configure is the agent mode.
 There are three possible agent modes:
 
 * `standard` - only generates metadata without any special processing (this is the default mode). No additional options available.
-* `conditional` - entries of the generated metadata will be included in the Native Image only if the condition in the entry is satisfied. Consumes following additional options:
+* `conditional` - entries of the generated metadata will be included in the Native Image only if the condition in the entry is satisfied. Consumes following options:
 ** `userCodeFilterPath` - specifies a filter file used to classify classes as user application classes. Generated conditions will only reference these classes See <<agent-filter-file, the following section>>
-** `extraFilterPath` - extra filter used to further filter the collected metadata. See <<agent-filter-file, the following section>>
+** `extraFilterPath` - (optional) extra filter used to further filter the collected metadata. See <<agent-filter-file, the following section>>
 * `direct` - in this mode user configures the agent completely manually by adding all options with:
 ** `options.add("<option>")`
 
@@ -581,7 +580,6 @@ These filter files that agent consumes have the following structure:
 The process how you can pass the config files to the agent is described in the <<additional-agent-options,previous section>>.
 
 We can see on the example how different filter files affect generated metadata:
-**Note that the following example was created with GraalVM 21 and that the format of the generated metadata can vary from version to version.**
 
 We are starting with the simple filter file:
 
@@ -594,58 +592,83 @@ We are starting with the simple filter file:
 }
 ----
 
-This filter file will instruct the agent to include everything and therefore, you will get a massive config files.
-For example this is how `resource-config.json` looks like:
+This filter file will instruct the agent to include everything and therefore, you will get a massive config file.
+For example this is how `reachability-metadata.json` looks like:
 
 [source,json,subs="verbatim,attributes", role="multi-language-sample"]
 ----
-{{
-  "resources":{
-  "includes":[{
-    "condition":{"typeReachable":"jdk.internal.logger.BootstrapLogger$DetectBackend$1"},
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "condition":{"typeReachable":"jdk.internal.logger.LoggerFinderLoader"},
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "condition":{"typeReachable":"java.nio.channels.spi.SelectorProvider$Holder"},
-    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
-  }, {
-    "condition":{"typeReachable":"java.time.zone.ZoneRulesProvider"},
-    "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherFactory"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.engine.TestEngine\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherFactory"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherFactory"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.LauncherSessionListener\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherFactory"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.PostDiscoveryFilter\\E"
-  }, {
-    "condition":{"typeReachable":"java.util.Iterator"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.TestExecutionListener\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherConfigurationParameters"},
-    "pattern":"\\Qjunit-platform.properties\\E"
-  }, {
-    "condition":{"typeReachable":"org.slf4j.LoggerFactory"},
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "condition":{"typeReachable":"worker.org.gradle.internal.classloader.FilteringClassLoader"},
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "condition":{"typeReachable":"java.lang.ClassLoader"},
-    "pattern":"\\Qresource.txt\\E"
-  }]},
-  "bundles":[]
-}
-----
-
-As you can see, there are lots of resources that you may don't want.
+{
+  {
+    "reflection": [
+      {
+        "condition": {
+          "typeReached": "java.io.ObjectInputStream"
+        },
+        "type": "[Ljava.lang.Object;"
+      },
+      {
+        "condition": {
+          "typeReached": "java.io.ObjectInputStream"
+        },
+        "type": "java.util.LinkedHashSet"
+      },
+      {
+        "condition": {
+          "typeReached": "org.gradle.api.internal.tasks.testing.junitplatform.JUnitPlatformTestClassProcessor"
+        },
+        "type": "org.example.NativeTests"
+      },
+      {
+        "condition": {
+          "typeReached": "org.junit.jupiter.engine.descriptor.ClassBasedTestDescriptor"
+        },
+        "type": "org.example.NativeTests",
+        "allDeclaredFields": true
+      },
+      {
+        "condition": {
+          "typeReached": "org.junit.jupiter.engine.descriptor.ExtensionUtils"
+        },
+        "type": "org.example.NativeTests"
+      },
+      ...
+    ],
+    "resources": [
+      {
+        "condition": {
+          "typeReached": "org.junit.platform.launcher.core.LauncherFactory"
+        },
+        "glob": "META-INF/services/org.junit.platform.engine.TestEngine"
+      },
+      {
+        "condition": {
+          "typeReached": "java.lang.ClassLoader"
+        },
+        "glob": "TestResource.txt"
+      },
+      ...
+    ],
+    "bundles": [],
+    "jni": [
+      {
+        "condition": {
+          "typeReached": "java.net.InetAddress"
+        },
+        "type": "java.lang.Boolean",
+        "methods": [
+          {
+            "name": "getBoolean",
+            "parameterTypes": [
+              "java.lang.String"
+            ]
+          }
+        ]
+      }
+    ]
+  }
+----
+
+As you can see, there are lots of entries that you may don't want.
 To reduce the amount of generated metadata, we will use the following `user-code-filter.json`:
 
 [source,json,subs="verbatim,attributes", role="multi-language-sample"]
@@ -653,45 +676,59 @@ To reduce the amount of generated metadata, we will use the following `user-code
 {
   "rules": [
     {"includeClasses": "**"},
-    {"excludeClasses": "java.time.zone.**"},
-    {"excludeClasses": "org.junit.platform..**"}
+    {"excludeClasses": "org.junit.**"},
+    {"excludeClasses": "org.gradle.**"},
+    {"excludeClasses": "worker.org.gradle.**"},
+    {"excludeClasses": "org.slf4j.**"},
+    {"excludeClasses": "java.**"}
   ]
 }
 ----
 
-After we regenerate the metadata with the new filter, `resource-config.json` generated on the same example as above will look like this:
+[WARNING]
+====
+Be careful to remove only redundant metadata and keep metadata necessary for your project.
+====
+
+After we regenerate the metadata with the new filter, `reachability-metadata.json` generated on the same example as above will look like this:
 
 [source,json,subs="verbatim,attributes", role="multi-language-sample"]
 ----
 {
-  "resources":{
-  "includes":[{
-    "condition":{"typeReachable":"jdk.internal.logger.BootstrapLogger$DetectBackend$1"},
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "condition":{"typeReachable":"jdk.internal.logger.LoggerFinderLoader"},
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "condition":{"typeReachable":"java.nio.channels.spi.SelectorProvider$Holder"},
-    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
-  }, {
-    "condition":{"typeReachable":"java.util.Iterator"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.TestExecutionListener\\E"
-  }, {
-    "condition":{"typeReachable":"org.slf4j.LoggerFactory"},
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "condition":{"typeReachable":"worker.org.gradle.internal.classloader.FilteringClassLoader"},
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "condition":{"typeReachable":"java.lang.ClassLoader"},
-    "pattern":"\\Qresource.txt\\E"
-  }]},
-  "bundles":[]
+  "reflection": [
+    {
+      "condition": {
+        "typeReached": "org.example.NativeTests"
+      },
+      "type": "org.example.NativeTests$Person",
+      "allDeclaredFields": true
+    },
+    {
+      "condition": {
+        "typeReached": "sun.security.jca.GetInstance"
+      },
+      "type": "sun.security.provider.SHA",
+      "methods": [
+        {
+          "name": "<init>",
+          "parameterTypes": []
+        }
+      ]
+    }
+  ],
+  "resources": [
+    {
+      "condition": {
+        "typeReached": "org.example.NativeTests"
+      },
+      "glob": "TestResource.txt"
+    }
+  ],
+  "bundles": []
 }
 ----
 
-As you can see there are no more entries that contain classes from `org.junit.platform.launcher` (as their condition) for example.
+As you can see there are no more entries that contain classes from `org.junit` (as their condition) for example.
 
 
 [[maintain-generated-metadata]]
@@ -732,12 +769,14 @@ In some cases, when you want to maintain multiple projects that share common met
 https://github.com/oracle/graalvm-reachability-metadata/blob/master/CONTRIBUTING.md[Contributing to the repository] should be simple:
 
 - Clone repository locally:
+
 [source,bash,subs="verbatim,attributes", role="multi-language-sample"]
 ----
 git clone git@github.com:oracle/graalvm-reachability-metadata.git
 ----
 
 - generate metadata and test stubs (replace with the GAV coordinates of library you are providing metadata for):
+
 [source,bash,subs="verbatim,attributes", role="multi-language-sample"]
 ----
 ./gradlew scaffold --coordinates com.example:my-library:1.0.0
@@ -769,11 +808,64 @@ When the Native Image build is completed, you will find a path to the generated
 ```
 ------------------------------------------------------------------------------------
 Build artifacts:
-/build/native/nativeCompile/main (executable)
-/build/native/nativeCompile/main-build-report.html (build_info)
+/tmp/build/native/nativeCompile/main (executable)
+/tmp/build/native/nativeCompile/main-build-report.html (build_info)
 ====================================================================================
 ```
 You can read more about build report features https://www.graalvm.org/latest/reference-manual/native-image/overview/build-report/[here].
 
 [NOTE]
 Note that Build Report features vary depending on a GraalVM version you use.
+
+[[example]]
+== Example
+
+Whole guide has been tested on the following test class:
+
+[source,java,subs="verbatim,attributes", role="multi-language-sample"]
+----
+import org.junit.jupiter.api.Test;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class NativeTests {
+
+    private static final List<String> resources = List.of("/TestResource.txt");
+
+    @Test
+    public void resourceTest() {
+        try (InputStream is = NativeTests.class.getResourceAsStream(resources.get(0))) {
+            if (is != null) {
+                var reader = new BufferedReader(new InputStreamReader(is));
+                reader.lines().forEach(System.out::println);
+            } else {
+                throw new IOException("Cannot read content of: " + resources.get(0));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static class Person {
+        private String name;
+        private String surname;
+    }
+
+    @Test
+    public void reflectionTest() {
+        Object person = new Person();
+        Field[] fields = person.getClass().getDeclaredFields();
+        List<String> actualFieldNames = Arrays.stream(fields).map(Field::getName).toList();
+
+        assertTrue(actualFieldNames.containsAll(Arrays.asList("name", "surname")));
+    }
+}
+----
diff --git a/docs/src/docs/asciidoc/end-to-end-maven-guide.adoc b/docs/src/docs/asciidoc/end-to-end-maven-guide.adoc
index c6c93f99..771a054c 100644
--- a/docs/src/docs/asciidoc/end-to-end-maven-guide.adoc
+++ b/docs/src/docs/asciidoc/end-to-end-maven-guide.adoc
@@ -6,6 +6,7 @@ The GraalVM team
 This guide leads you through the process of integrating Native Maven Plugin with your project.
 It starts from adding the plugin to your project, goes through some of the main functionalities that you may use (like collecting the metadata),
 all the way to some diagnostics tools that you can use to analyse native executables you have made.
+You can see an example of tests on which we tested whole guide <<example,here>>
 
 In case you only want to see how a simple application works in practise, you can check <<quickstart-maven-plugin.adoc#,our demo>>.
 
@@ -44,7 +45,8 @@ In order to use Native Image through Maven, you must add the following block int
       </execution>
     </executions>
     <configuration>
-      <!-- ... -->
+        <imageName>example-app</imageName>
+        <mainClass>org.example.Main</mainClass>
     </configuration>
 </plugin>
 ----
@@ -80,7 +82,8 @@ For convenience, you can create a maven profile and add plugin into it:
               </execution>
             </executions>
             <configuration>
-              <!-- ... -->
+              <imageName>example-app</imageName>
+              <mainClass>org.example.Main</mainClass>
             </configuration>
           </plugin>
         </plugins>
@@ -89,22 +92,23 @@ For convenience, you can create a maven profile and add plugin into it:
 </profiles>
 ----
 
-To make the plugin works, replace `${native.maven.plugin.version}` with the plugin version you may want to use (the latest plugin version is '{maven-plugin-version}').
+
+To make the plugin works replace _${native.maven.plugin.version}_ with the plugin version you may want to use (the latest plugin version is `{maven-plugin-version}`).
 You can also check other versions of the plugin https://github.com/graalvm/native-build-tools/releases[here].
 
 [TIP]
 ====
-You can also add `<properties>` block in your `pom.xml` and define the plugin version inside it.
+You can also define this property inside top level `<properties>` block in your `pom.xml`.
 That way, you don't need to replace `${native.maven.plugin.version}`.
 This is an example of the properties block with the plugin version definition:
 
 [source,xml, role="multi-language-sample"]
 ----
 <properties>
-    <native.maven.plugin.version>0.10.4</native.maven.plugin.version>
-    <junit.platform.native.version>0.10.4</junit.platform.native.version>
-    <imageName>example-app</imageName>
-    <mainClass>org.graalvm.demo.Application</mainClass>
+    <native.maven.plugin.version>0.10.3</native.maven.plugin.version>
+    <junit.platform.native.version>0.10.3</junit.platform.native.version>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
 </properties>
 ----
 ====
@@ -125,6 +129,44 @@ mvn -Pnative package
 ----
 ====
 
+This will generate native image under `target` directory.
+
+[TIP]
+====
+If you are experiencing error like this:
+
+----
+[ERROR] Test configuration file wasn't found. Make sure that test execution wasn't skipped.
+----
+
+while running your tests, add the following plugin
+
+[source,xml, role="multi-language-sample"]
+----
+<plugin>
+    <groupId>org.apache.maven.plugins</groupId>
+    <artifactId>maven-surefire-plugin</artifactId>
+    <version>3.0.0-M5</version>
+</plugin>
+----
+====
+
+[TIP]
+====
+If you are running JUnit tests, you may need to add the following dependency:
+
+[source,xml, role="multi-language-sample"]
+----
+<dependency>
+    <groupId>org.junit.jupiter</groupId>
+    <artifactId>junit-jupiter</artifactId>
+    <version>5.10.0</version>
+    <scope>test</scope>
+</dependency>
+----
+
+====
+
 [[configuration-options]]
 == Providing configuration options
 
@@ -146,13 +188,12 @@ By default the plugin consults several locations in the pom.xml file in the foll
 * `<systemPropertyVariables>` - Sets the system properties to use for the native image builder
 * `<environment>` - Sets the environment options for native image building
 * `<jvmArgs>` - Passes the given argument directly to the JVM running the native image builder
-* `<configurationFileDirectories>` - Adds a native image configuration file directory, containing files like reflection configuration
 * `<useArgFile>` - Use argument file for native-image building (__false__ by default)
 
-You can also pass **build-time** and **run-time** options to the Native Image inside the following blocks:
+You can also pass **build-time** options to the Native Image inside the following blocks:
 
-- `<buildArgs>` - You can find more about possible build arguments https://www.graalvm.org/latest/reference-manual/native-image/overview/BuildConfiguration/[here]
-- `???` - You can find more about possible runtime arguments https://www.graalvm.org/latest/reference-manual/native-image/overview/Options/[here]
+- `<buildArgs>` - You can find more about possible build arguments https://www.graalvm.org/latest/reference-manual/native-image/overview/Options/[here]
+and also https://www.graalvm.org/latest/reference-manual/native-image/overview/BuildConfiguration/[here]
 
 To skip generation of the native image or tests execution set the following properties to `true`:
 
@@ -189,11 +230,6 @@ Here is an example of additional options usage:
         <propertyName1>value1</propertyName1>
         <propertyName1>value2</propertyName2>
     </systemPropertyVariables>
-
-    <configurationFileDirectories>
-        <dir>path/to/dir</dir>
-    </configurationFileDirectories>
-
 </configuration>
 ----
 
@@ -240,16 +276,17 @@ mvn -Pnative -Dagent=true test
 
 [WARNING]
 ====
-Executing your application with the agent is more involved and requires you to configure a separate mojo execution which allows forking the Java process.
+*Executing your application* with the agent is more involved and requires you to configure a separate mojo execution which allows forking the Java process.
 You can find out how to execute your application with the agent <<maven-plugin.adoc#agent-support-running-application,here>>.
 ====
 
 [[metadata-copy]]
 === Move generated metadata to non-default location
 
-By default, generated metadata will be placed inside `build/native/agent-output` directory.
-In many cases you may want to move generated metadata to some other location.
+By default, generated metadata will be placed inside `target/native/agent-output` directory.
+In many cases you may want to move generated metadata to some other location since the `target` directory gets removed every time you run `mvn clean` command.
 To do so, you can configure and run `metadataCopy` task.
+That way your metadata becomes persistent on the non-default location.
 
 ==== Configure metadataCopy task
 
@@ -291,17 +328,6 @@ mvn -Pnative test native:metadata-copy
 ====
 Note that **if you store generated metadata on location other than the default one**, you will need to pass that location like this:
 
-[source,xml, role="multi-language-sample"]
-----
-<configuration>
-    <configurationFileDirectories>
-        <dir>path/to/metadata</dir>
-    </configurationFileDirectories>
-</configuration>
-----
-
-or as a Native Image `buildArg` with `-H:ConfigurationFileDirectories` option:
-
 [source,xml, role="multi-language-sample"]
 ----
 <configuration>
@@ -346,12 +372,16 @@ Here is an example of the `agent` block with configured conditional and direct m
         <conditional>
             <userCodeFilterPath>user-code-filter.json</userCodeFilterPath>
             <extraFilterPath>extra-filter.json</extraFilterPath>
-            <parallel>true</parallel>
         </conditional>
     </modes>
 </agent>
 ----
 
+[NOTE]
+====
+In order to make your project run with the above configuration, you must create <<agent-filter-file,filter files>> (_extraFilterPath_ is optional and you can remove the tag if it is redundant).
+====
+
 [[common-agent-options]]
 ==== Common agent options
 
@@ -380,7 +410,6 @@ Complete example of the agent block should look like this:
         <conditional>
             <userCodeFilterPath>path-to-filter.json</userCodeFilterPath>
             <extraFilterPath>path-to-another-filter.json</extraFilterPath>
-            <parallel>true</parallel>
         </conditional>
     </modes>
 
@@ -447,54 +476,162 @@ We are starting with the simple filter file:
 }
 ----
 
-This filter file will instruct the agent to include everything and therefore, you will get a massive config files.
-For example this is how `resource-config.json` looks like:
+This filter file will instruct the agent to include everything and therefore, you will get a massive config file.
+For example this is how `reachability-metadata.json` looks like:
 
 [source,json,subs="verbatim,attributes", role="multi-language-sample"]
 ----
-{{
-  "resources":{
-  "includes":[{
-    "condition":{"typeReachable":"jdk.internal.logger.BootstrapLogger$DetectBackend$1"},
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "condition":{"typeReachable":"jdk.internal.logger.LoggerFinderLoader"},
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "condition":{"typeReachable":"java.nio.channels.spi.SelectorProvider$Holder"},
-    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
-  }, {
-    "condition":{"typeReachable":"java.time.zone.ZoneRulesProvider"},
-    "pattern":"\\QMETA-INF/services/java.time.zone.ZoneRulesProvider\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherFactory"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.engine.TestEngine\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherFactory"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.LauncherDiscoveryListener\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherFactory"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.LauncherSessionListener\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherFactory"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.PostDiscoveryFilter\\E"
-  }, {
-    "condition":{"typeReachable":"java.util.Iterator"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.TestExecutionListener\\E"
-  }, {
-    "condition":{"typeReachable":"org.junit.platform.launcher.core.LauncherConfigurationParameters"},
-    "pattern":"\\Qjunit-platform.properties\\E"
-  }, {
-    "condition":{"typeReachable":"org.slf4j.LoggerFactory"},
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "condition":{"typeReachable":"worker.org.gradle.internal.classloader.FilteringClassLoader"},
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "condition":{"typeReachable":"java.lang.ClassLoader"},
-    "pattern":"\\Qresource.txt\\E"
-  }]},
-  "bundles":[]
+{
+  "reflection": [
+    {
+      "condition": {
+        "typeReached": "java.util.concurrent.atomic.AtomicBoolean"
+      },
+      "type": "java.util.concurrent.atomic.AtomicBoolean",
+      "fields": [
+        {
+          "name": "value"
+        }
+      ]
+    },
+    {
+      "condition": {
+        "typeReached": "org.apache.maven.surefire.booter.ForkedBooter"
+      },
+      "type": "org.apache.maven.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory"
+    },
+    {
+      "condition": {
+        "typeReached": "org.apache.maven.surefire.booter.ForkedBooter"
+      },
+      "type": "org.apache.maven.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory"
+    },
+    {
+      "condition": {
+        "typeReached": "org.junit.platform.launcher.core.DefaultLauncher"
+      },
+      "type": "org.apiguardian.api.API"
+    },
+    {
+      "condition": {
+        "typeReached": "java.lang.Class"
+      },
+      "type": "org.example.NativeTests"
+    },
+    {
+      "condition": {
+        "typeReached": "java.util.Collections$2"
+      },
+      "type": "org.example.NativeTests"
+    },
+    {
+      "condition": {
+        "typeReached": "org.apache.maven.surefire.api.util.DefaultScanResult"
+      },
+      "type": "org.example.NativeTests"
+    },
+    {
+      "condition": {
+        "typeReached": "org.junit.jupiter.engine.JupiterTestEngine"
+      },
+      "type": "org.example.NativeTests"
+    },
+    {
+      "condition": {
+        "typeReached": "org.junit.jupiter.engine.discovery.ClassSelectorResolver$$Lambda/0x00007a5c0f03fbb8"
+      },
+      "type": "org.example.NativeTests"
+    },
+    {
+      "condition": {
+        "typeReached": "java.security.Provider$Service"
+      },
+      "type": "sun.security.provider.SHA",
+      "methods": [
+        {
+          "name": "<init>",
+          "parameterTypes": []
+        }
+      ]
+    }
+    ...
+  ],
+  "resources": [
+    {
+      "condition": {
+        "typeReached": "jdk.internal.logger.BootstrapLogger$DetectBackend$1"
+      },
+      "glob": "META-INF/services/java.lang.System$LoggerFinder"
+    },
+    {
+      "condition": {
+        "typeReached": "jdk.internal.logger.LoggerFinderLoader"
+      },
+      "glob": "META-INF/services/java.lang.System$LoggerFinder"
+    },
+    {
+      "condition": {
+        "typeReached": "org.apache.maven.surefire.booter.ForkedBooter"
+      },
+      "glob": "META-INF/services/org.apache.maven.surefire.spi.MasterProcessChannelProcessorFactory"
+    },
+    {
+      "condition": {
+        "typeReached": "java.lang.ClassLoader"
+      },
+      "glob": "TestResource.txt"
+    },
+    ...
+  ],
+  "bundles": [],
+  "jni": [
+    {
+      "condition": {
+        "typeReached": "sun.nio.ch.IOUtil"
+      },
+      "type": "java.lang.Boolean",
+      "methods": [
+        {
+          "name": "getBoolean",
+          "parameterTypes": [
+            "java.lang.String"
+          ]
+        }
+      ]
+    },
+    {
+      "condition": {
+        "typeReached": "sun.management.VMManagementImpl"
+      },
+      "type": "sun.management.VMManagementImpl",
+      "fields": [
+        {
+          "name": "compTimeMonitoringSupport"
+        },
+        {
+          "name": "currentThreadCpuTimeSupport"
+        },
+        {
+          "name": "objectMonitorUsageSupport"
+        },
+        {
+          "name": "otherThreadCpuTimeSupport"
+        },
+        {
+          "name": "remoteDiagnosticCommandsSupport"
+        },
+        {
+          "name": "synchronizerUsageSupport"
+        },
+        {
+          "name": "threadAllocatedMemorySupport"
+        },
+        {
+          "name": "threadContentionMonitoringSupport"
+        }
+      ]
+    }
+  ]
 }
 ----
 
@@ -506,45 +643,48 @@ To reduce the amount of generated metadata, we will use the following `user-code
 {
   "rules": [
     {"includeClasses": "**"},
-    {"excludeClasses": "java.time.zone.**"},
-    {"excludeClasses": "org.junit.platform..**"}
+    {"excludeClasses": "org.apache.maven.**"},
+    {"excludeClasses": "org.junit.**"},
+    {"excludeClasses": "java.**"},
+    {"excludeClasses": "jdk.internal.**"},
+    {"excludeClasses": "sun.**"},
+    {"excludeClasses": "com.sun.**"}
   ]
 }
 ----
 
-After we regenerate the metadata with the new filter, `resource-config.json` generated on the same example as above will look like this:
+[WARNING]
+====
+Be careful to remove only redundant metadata and keep metadata necessary for your project.
+====
+
+After we regenerate the metadata with the new filter, `reachability-metadata.json` generated on the same example as above will look like this:
 
 [source,json,subs="verbatim,attributes", role="multi-language-sample"]
 ----
 {
-  "resources":{
-  "includes":[{
-    "condition":{"typeReachable":"jdk.internal.logger.BootstrapLogger$DetectBackend$1"},
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "condition":{"typeReachable":"jdk.internal.logger.LoggerFinderLoader"},
-    "pattern":"\\QMETA-INF/services/java.lang.System$LoggerFinder\\E"
-  }, {
-    "condition":{"typeReachable":"java.nio.channels.spi.SelectorProvider$Holder"},
-    "pattern":"\\QMETA-INF/services/java.nio.channels.spi.SelectorProvider\\E"
-  }, {
-    "condition":{"typeReachable":"java.util.Iterator"},
-    "pattern":"\\QMETA-INF/services/org.junit.platform.launcher.TestExecutionListener\\E"
-  }, {
-    "condition":{"typeReachable":"org.slf4j.LoggerFactory"},
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "condition":{"typeReachable":"worker.org.gradle.internal.classloader.FilteringClassLoader"},
-    "pattern":"\\Qorg/slf4j/impl/StaticLoggerBinder.class\\E"
-  }, {
-    "condition":{"typeReachable":"java.lang.ClassLoader"},
-    "pattern":"\\Qresource.txt\\E"
-  }]},
-  "bundles":[]
+  "reflection": [
+    {
+      "condition": {
+        "typeReached": "org.example.NativeTests"
+      },
+      "type": "org.example.NativeTests$Person",
+      "allDeclaredFields": true
+    }
+  ],
+  "resources": [
+    {
+      "condition": {
+        "typeReached": "org.example.NativeTests"
+      },
+      "glob": "TestResource.txt"
+    }
+  ],
+  "bundles": []
 }
 ----
 
-As you can see there are no more entries that contain classes from `org.junit.platform.launcher` (as their condition) for example.
+As you can see there are no more entries that contain classes from `org.apache.maven` (as their condition) for example.
 
 [[maintain-generated-metadata]]
 == Maintain generated metadata
@@ -555,9 +695,13 @@ Considering that you run your tests in certain CI, at some point (after updating
 In that case, your metadata requires update.
 
 [WARNING]
-Be aware that if you modified existing metadata file(s) on the default location, generating a new metadata will overwrite the existing one and your manual changes will be lost.
+====
+As we already mentioned, metadata generated on the default location, under `target` directory, is not persistent because every run of the `mvn clean` removes the directory.
+To persist metadata, you should move it to some non-default location, as described <<metadata-copy, here>>
+However, note that if you modified existing metadata file(s) on the non-default location, generating a new metadata and moving it to the same (non-default) location will overwrite the existing metadata you have changed.
+====
 
-So if you modified existing metadata file(s) on the default location, please do the following:
+So if you modified existing metadata file(s), please do the following:
 
 1. Set `merge` option to true in the `metadataCopy` block
 2. Run your tests again to generate new metadata (as we already described <<execute-metadata-copy-task, here>>)
@@ -622,11 +766,65 @@ When the Native Image build is completed, you will find a path to the generated
 ```
 ------------------------------------------------------------------------------------
 Build artifacts:
-/build/native/nativeCompile/main (executable)
-/build/native/nativeCompile/main-build-report.html (build_info)
+
+/tmp/target/native-tests (executable)
+/tmp/target/native-tests-build-report.html (build_info)
 ====================================================================================
 ```
 You can read more about build report features https://www.graalvm.org/latest/reference-manual/native-image/overview/build-report/[here].
 
 [NOTE]
 Note that Build Report features vary depending on a GraalVM version you use.
+
+[[example]]
+== Example
+
+Whole guide has been tested on the following test class:
+
+[source,java,subs="verbatim,attributes", role="multi-language-sample"]
+----
+import org.junit.jupiter.api.Test;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.lang.reflect.Field;
+import java.util.Arrays;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+public class NativeTests {
+
+    private static final List<String> resources = List.of("/TestResource.txt");
+
+    @Test
+    public void resourceTest() {
+        try (InputStream is = NativeTests.class.getResourceAsStream(resources.get(0))) {
+            if (is != null) {
+                var reader = new BufferedReader(new InputStreamReader(is));
+                reader.lines().forEach(System.out::println);
+            } else {
+                throw new IOException("Cannot read content of: " + resources.get(0));
+            }
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private static class Person {
+        private String name;
+        private String surname;
+    }
+
+    @Test
+    public void reflectionTest() {
+        Object person = new Person();
+        Field[] fields = person.getClass().getDeclaredFields();
+        List<String> actualFieldNames = Arrays.stream(fields).map(Field::getName).toList();
+
+        assertTrue(actualFieldNames.containsAll(Arrays.asList("name", "surname")));
+    }
+}
+----
diff --git a/docs/src/docs/asciidoc/gradle-plugin.adoc b/docs/src/docs/asciidoc/gradle-plugin.adoc
index adc31587..0d38c54a 100644
--- a/docs/src/docs/asciidoc/gradle-plugin.adoc
+++ b/docs/src/docs/asciidoc/gradle-plugin.adoc
@@ -169,9 +169,6 @@ graalvmNative {
 }
 ----
 
-[[configuration-options]]
-==== Configuration options
-
 The following configuration options are available for building images:
 
 .NativeImageOption configuration
@@ -185,25 +182,6 @@ include::../snippets/gradle/groovy/build.gradle[tags=all-config-options]
 include::../snippets/gradle/kotlin/build.gradle.kts[tags=all-config-options]
 ----
 
-Native Image Agent options:
-
-* `defaultMode` - Default agent mode if one isn't specified using `-Pagent=mode_name`
-* `enabled` - Enables the agent
-* `modes`- you can configure following agent modes:
-    ** `standard` -The standard agent mode generates metadata without conditions
-    ** `conditional` - The conditional agent mode generates metadata with conditions
-        *** `userCodeFilterPath` - Path to a filter file that determines classes which will be used in the metadata conditions
-        *** `extraFilterPath` - Optional, extra filter used to further filter the collected metadata
-    ** `direct` - The direct agent mode allows users to directly pass options to the agent
-        *** `{output_dir}` - a special string expanded by the plugin to where the agent files would usually be output
-* `tasksToInstrumentPredicate` - By default, if `-Pagent` is specified, all tasks that extend JavaForkOptions are instrumented.
-This can be limited to only specific tasks that match this predicate.
-
-[TIP]
-Options like `callerFilterFiles`, `accessFilterFiles`, `builtinCallerFilter`, `builtinHeuristicFilter`, `enableExperimentalPredefinedClasses`, `enableExperimentalUnsafeAllocationTracing` and `trackReflectionMetadata`
-are common for all agent modes and intended to be used for more advanced purposes. You can read more about those options https://www.graalvm.org/latest/reference-manual/native-image/metadata/AutomaticMetadataCollection/#agent-advanced-usage[here].
-
-
 Native Image options:
 
 - `imageName` -The name of the native image, defaults to the project name
@@ -221,14 +199,32 @@ Native Image options:
 - `jvmArgs` - Passes the given argument directly to the JVM running the native image builder
 - `useFatJar` - Instead of passing each jar individually, builds a fat jar
 
-You can also pass **build-time** and **run-time** options to the Native Image using:
+You can also pass **build-time** and **run-time** arguments:
 
 - `buildArgs.add('<buildArg>')` - You can find more about possible build arguments https://www.graalvm.org/latest/reference-manual/native-image/overview/BuildConfiguration/[here]
-- `runtimeArgs.add('<runtimeArg>')` - You can find more about possible runtime arguments https://www.graalvm.org/latest/reference-manual/native-image/overview/Options/[here]
+- `runtimeArgs.add('<runtimeArg>')` - Runtime arguments consumed by your application
 
 
 NOTE: For options that can be set using command-line, if both DSL and command-line options are present, command-line options take precedence.
 
+Native Image Agent options:
+
+* `defaultMode` - Default agent mode if one isn't specified using `-Pagent=mode_name`
+* `enabled` - Enables the agent
+* `modes`- you can configure following agent modes:
+    ** `standard` -The standard agent mode generates metadata without conditions
+    ** `conditional` - The conditional agent mode generates metadata with conditions
+        *** `userCodeFilterPath` - Path to a filter file that determines classes which will be used in the metadata conditions
+        *** `extraFilterPath` - Optional, extra filter used to further filter the collected metadata
+    ** `direct` - The direct agent mode allows users to directly pass options to the agent
+        *** `{output_dir}` - a special string expanded by the plugin to where the agent files would usually be output
+* `tasksToInstrumentPredicate` - By default, if `-Pagent` is specified, all tasks that extend JavaForkOptions are instrumented.
+This can be limited to only specific tasks that match this predicate.
+
+[TIP]
+Options like `callerFilterFiles`, `accessFilterFiles`, `builtinCallerFilter`, `builtinHeuristicFilter`, `enableExperimentalPredefinedClasses`, `enableExperimentalUnsafeAllocationTracing` and `trackReflectionMetadata`
+are common for all agent modes and intended to be used for more advanced purposes. You can read more about those options https://www.graalvm.org/latest/reference-manual/native-image/metadata/AutomaticMetadataCollection/#agent-advanced-usage[here].
+
 [[agent-support]]
 ==== Reflection support and running with the native agent
 
diff --git a/docs/src/docs/asciidoc/maven-plugin.adoc b/docs/src/docs/asciidoc/maven-plugin.adoc
index 15060e29..49e1c2ea 100644
--- a/docs/src/docs/asciidoc/maven-plugin.adoc
+++ b/docs/src/docs/asciidoc/maven-plugin.adoc
@@ -216,14 +216,6 @@ Build Configuration]. It is also possible to customize the plugin within a
     <arg>argument2</arg>
 </jvmArgs>
 ----
-`<configurationFileDirectories>`::
-   If you want to specify custom directories where configuration files should be looked up, supply the following in the configuration of the plugin:
-[source,xml, role="multi-language-sample"]
-----
-<configurationFileDirectories>
-    <dir>path/to/dir</dir>
-</configurationFileDirectories>
-----
 `<classpath>`::
    Sets a custom classpath instead of plugin generated one. Usage:
 [source,xml, role="multi-language-sample"]
diff --git a/docs/src/docs/snippets/gradle/groovy/build.gradle b/docs/src/docs/snippets/gradle/groovy/build.gradle
index beb64c22..268ccf69 100644
--- a/docs/src/docs/snippets/gradle/groovy/build.gradle
+++ b/docs/src/docs/snippets/gradle/groovy/build.gradle
@@ -67,6 +67,34 @@ if (providers.environmentVariable("ENABLE_TOOLCHAIN").isPresent()) {
 
 // tag::all-config-options[]
 graalvmNative {
+    binaries {
+        main {
+            imageName = 'application'
+            mainClass = 'org.test.Main'
+            debug = true
+            verbose = true
+            fallback = true
+            sharedLibrary = false
+            quickBuild = false
+            richOutput = false
+            requiredVersion = '22.3'
+
+            systemProperties = [name1: 'value1', name2: 'value2']
+            configurationFileDirectories.from(file('src/my-config'))
+            excludeConfig.put("org.example.test:artifact:version", ["^/META-INF/native-image/.*", "^/config/.*"])
+            excludeConfig.put(file("path/to/artifact.jar"), listOf("^/META-INF/native-image/.*", "^/config/.*"))
+
+            // Advanced options
+            buildArgs.add('--link-at-build-time')
+            jvmArgs.add('flag')
+
+            // Runtime options
+            runtimeArgs.add('--help')
+
+            useFatJar = true
+        }
+    }
+
     agent {
         defaultMode = "standard"
         enabled = true
@@ -98,37 +126,8 @@ graalvmNative {
             mergeWithExisting = true
         }
 
-
         tasksToInstrumentPredicate = t -> true
     }
-
-    binaries {
-        main {
-            imageName = 'application'
-            mainClass = 'org.test.Main'
-            debug = true
-            verbose = true
-            fallback = true
-            sharedLibrary = false
-            quickBuild = false
-            richOutput = false
-            requiredVersion = '22.3'
-
-            systemProperties = [name1: 'value1', name2: 'value2']
-            configurationFileDirectories.from(file('src/my-config'))
-            excludeConfig.put("org.example.test:artifact:version", ["^/META-INF/native-image/.*", "^/config/.*"])
-            excludeConfig.put(file("path/to/artifact.jar"), listOf("^/META-INF/native-image/.*", "^/config/.*"))
-
-            // Advanced options
-            buildArgs.add('--link-at-build-time')
-            jvmArgs.add('flag')
-
-            // Runtime options
-            runtimeArgs.add('--help')
-
-            useFatJar = true
-        }
-    }
 }
 // end::all-config-options[]
 
diff --git a/docs/src/docs/snippets/gradle/kotlin/build.gradle.kts b/docs/src/docs/snippets/gradle/kotlin/build.gradle.kts
index ecef5476..75f5155d 100644
--- a/docs/src/docs/snippets/gradle/kotlin/build.gradle.kts
+++ b/docs/src/docs/snippets/gradle/kotlin/build.gradle.kts
@@ -68,6 +68,34 @@ if (providers.environmentVariable("ENABLE_TOOLCHAIN").isPresent()) {
 
 // tag::all-config-options[]
 graalvmNative {
+    binaries {
+        named("main") {
+            imageName.set("application")
+            mainClass.set("org.test.Main")
+            debug.set(true)
+            verbose.set(true)
+            fallback.set(true)
+            sharedLibrary.set(false)
+            richOutput.set(false)
+            requiredVersion.set('22.3')
+            quickBuild.set(false)
+
+            systemProperties.putAll(mapOf("name1" to "value1", "name2" to "value2"))
+            configurationFileDirectories.from(file("src/my-config"))
+            excludeConfig.put("org.example.test:artifact:version", listOf("^/META-INF/native-image/.*", "^/config/.*"))
+            excludeConfig.put(file("path/to/artifact.jar"), listOf("^/META-INF/native-image/.*", "^/config/.*"))
+
+            // Advanced options
+            buildArgs.add("--link-at-build-time")
+            jvmArgs.add("flag")
+
+            // Runtime options
+            runtimeArgs.add("--help")
+
+            useFatJar.set(true)
+        }
+    }
+
     agent {
         defaultMode.set("standard")
         enabled.set(true)
@@ -101,34 +129,6 @@ graalvmNative {
 
         tasksToInstrumentPredicate.set(t -> true)
     }
-
-    binaries {
-        named("main") {
-            imageName.set("application")
-            mainClass.set("org.test.Main")
-            debug.set(true)
-            verbose.set(true)
-            fallback.set(true)
-            sharedLibrary.set(false)
-            richOutput.set(false)
-            requiredVersion.set('22.3')
-            quickBuild.set(false)
-
-            systemProperties.putAll(mapOf("name1" to "value1", "name2" to "value2"))
-            configurationFileDirectories.from(file("src/my-config"))
-            excludeConfig.put("org.example.test:artifact:version", listOf("^/META-INF/native-image/.*", "^/config/.*"))
-            excludeConfig.put(file("path/to/artifact.jar"), listOf("^/META-INF/native-image/.*", "^/config/.*"))
-
-            // Advanced options
-            buildArgs.add("--link-at-build-time")
-            jvmArgs.add("flag")
-
-            // Runtime options
-            runtimeArgs.add("--help")
-
-            useFatJar.set(true)
-        }
-    }
 }
 // end::all-config-options[]