diff --git a/SOURCES/modulemd.src.txt b/SOURCES/modulemd.src.txt
index 26678e2..a428e7f 100644
--- a/SOURCES/modulemd.src.txt
+++ b/SOURCES/modulemd.src.txt
@@ -2,6 +2,7 @@ document: modulemd
 version: 2
 data:
   stream: rhel8
+  arch: x86_64
   summary: Java Mission Control is a profiling and diagnostics tool for the Hotspot JVM
   description: >-
     Java Mission Control is a powerful profiler for HotSpot JVMs and has an
@@ -29,47 +30,63 @@ data:
   api:
     rpms:
     - jmc-core
+  filter:
+    rpms:
+    - mvel
+    - mvel-javadoc
   components:
     rpms:
       directory-maven-plugin:
         buildorder: 0
-        ref: stream-rhel8-rhel-8.2.1
+        ref: stream-rhel8-rhel-8.4.0
         rationale: >
           Dependency of jmc and jaf.
         arches: [x86_64]
       ee4j-parent:
         buildorder: 0
-        ref: stream-rhel8-rhel-8.2.1
+        ref: stream-rhel8-rhel-8.4.0
         arches: [x86_64]
         rationale: >
           Dependency of jaf.
+      mvel:
+        buildorder: 0
+        ref: stream-rhel8-rhel-8.4.0
+        arches: [x86_64]
+        rationale: >
+          Dependency of lz4-java.
       owasp-java-encoder:
         buildorder: 0
-        ref: stream-rhel8-rhel-8.2.1
+        ref: stream-rhel8-rhel-8.4.0
         arches: [x86_64]
         rationale: >
           Dependency of jmc-core.
       jaf:
         buildorder: 1
-        ref: stream-rhel8-rhel-8.2.1
+        ref: stream-rhel8-rhel-8.4.0
+        arches: [x86_64]
+        rationale: >
+          Dependency of jmc.
+      lz4-java:
+        buildorder: 1
+        ref: stream-rhel8-rhel-8.4.0
+        arches: [x86_64]
+        rationale: >
+          Dependency of jmc-core
+      HdrHistogram:
+        buildorder: 2
+        ref: stream-rhel8-rhel-8.4.0
         arches: [x86_64]
         rationale: >
           Dependency of jmc.
       jmc-core:
-        buildorder: 1
-        ref: stream-rhel8-rhel-8.2.1
+        buildorder: 2
+        ref: stream-rhel8-rhel-8.4.0
         arches: [x86_64]
         rationale: >
           Core API. Dependency of jmc.
-      HdrHistogram:
-        buildorder: 2
-        ref: stream-rhel8-rhel-8.2.1
-        arches: [x86_64]
-        rationale: >
-          Dependency of jmc.
       jmc:
         buildorder: 3
-        ref: stream-rhel8-rhel-8.2.1
+        ref: stream-rhel8-rhel-8.4.0
         arches: [x86_64]
         rationale: >
           Standalone application.