diff --git a/atomos.utils/atomos.utils.api/src/main/java/org/apache/felix/atomos/utils/api/Context.java b/atomos.utils/atomos.utils.api/src/main/java/org/apache/felix/atomos/utils/api/Context.java
index 2e96ec3e..d86d6207 100644
--- a/atomos.utils/atomos.utils.api/src/main/java/org/apache/felix/atomos/utils/api/Context.java
+++ b/atomos.utils/atomos.utils.api/src/main/java/org/apache/felix/atomos/utils/api/Context.java
@@ -102,7 +102,7 @@ default void addMethodsAllPublic(Class<?> clazz)
 
     void addResourceConfig(ResourceConfiguration resourceConfig);
 
-    Stream<Path> getFiles(FileType... fileType);
+    List<Path> getFiles(FileType... fileType);
 
     List<RegisterServiceCall> getRegisterServiceCalls();
 
diff --git a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/ContextImpl.java b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/ContextImpl.java
index 961981f9..25df9342 100644
--- a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/ContextImpl.java
+++ b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/ContextImpl.java
@@ -24,6 +24,7 @@
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import org.apache.felix.atomos.utils.api.Context;
@@ -196,11 +197,14 @@ public DynamicProxyConfiguration getDynamicProxyConfig()
     }
 
     @Override
-    public Stream<Path> getFiles(FileType... fileType)
+    public List<Path> getFiles(FileType... fileType)
     {
-        return paths.entrySet().parallelStream().filter(
-            e -> List.of(fileType).stream().filter(Objects::nonNull).anyMatch(
-                t -> t.equals(e.getValue()))).map(Entry::getKey);
+        return paths.entrySet().parallelStream()//
+            .filter(e -> List.of(fileType).stream()//
+                .filter(Objects::nonNull)//
+                .anyMatch(t -> t.equals(e.getValue())))//
+            .map(Entry::getKey)//
+            .collect(Collectors.toList());
     }
 
     Map<Path, FileType> getPaths()
diff --git a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/LauncherImpl.java b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/LauncherImpl.java
index 7a595e12..5165428e 100644
--- a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/LauncherImpl.java
+++ b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/LauncherImpl.java
@@ -168,23 +168,22 @@ public Context execute(Context context)
 
         //CollectFiles
         orderdPluginsBy(FileCollectorPlugin.class)//
-            .peek(System.out::println)//
-            .forEachOrdered(plugin -> plugin.collectFiles(context));//
+        .peek(System.out::println)//
+        .forEachOrdered(plugin -> plugin.collectFiles(context));//
 
         //Visit all files with type
         orderdPluginsBy(FileHandlerPlugin.class)//
-            .peek(System.out::println)//
-            .forEachOrdered(plugin -> {
+        .peek(System.out::println)//
+        .forEachOrdered(plugin -> {
 
-                //for each FileType
-                List.of(FileType.values()).forEach(fileType -> {
-                    context.getFiles(fileType)//
-                        .forEach(path -> plugin.handleFile(context, path, fileType));
-                });
-            });//
+            //for each FileType
+            List.of(FileType.values()).forEach(fileType -> {
+                context.getFiles(fileType)//
+                .forEach(path -> plugin.handleFile(context, path, fileType));
+            });
+        });//
 
-        List<Path> artifacts = context.getFiles(FileType.ARTIFACT).collect(
-            Collectors.toList());
+            List<Path> artifacts = context.getFiles(FileType.ARTIFACT);
         URL[] urls = artifacts.stream().map(p -> {
             try
             {
@@ -301,9 +300,9 @@ private void processJar(JarFile j, Context context, URLClassLoader classLoader)
                 bundleActivatorClass = classLoader.loadClass(
                     bundleActivatorClassName.trim());
                 orderdPluginsBy(BundleActivatorPlugin.class)//
-                    .peek(System.out::println)//
-                    .forEachOrdered(plugin -> plugin.doBundleActivator(
-                        bundleActivatorClass, context, classLoader));
+                .peek(System.out::println)//
+                .forEachOrdered(plugin -> plugin.doBundleActivator(
+                    bundleActivatorClass, context, classLoader));
             }
             catch (ClassNotFoundException e)
             {
diff --git a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/finaliser/ni/NativeImagePlugin.java b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/finaliser/ni/NativeImagePlugin.java
index 7c245858..c0f8249a 100644
--- a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/finaliser/ni/NativeImagePlugin.java
+++ b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/finaliser/ni/NativeImagePlugin.java
@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.apache.felix.atomos.utils.api.Context;
 import org.apache.felix.atomos.utils.api.FileType;
@@ -58,7 +57,7 @@ public void doFinal(Context context)
 
             //prepare classpath
             List<Path> classpath = context.getFiles(FileType.ARTIFACT,
-                FileType.INDEX_JAR).collect(Collectors.toList());
+                FileType.INDEX_JAR);
             System.out.println(native_image_build_timed);
             List<Path> copyOfClassPath = new ArrayList<>();
             classpath.forEach(p -> {
diff --git a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/finaliser/shade/ShaderPlugin.java b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/finaliser/shade/ShaderPlugin.java
index cf40d5c3..448c6624 100644
--- a/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/finaliser/shade/ShaderPlugin.java
+++ b/atomos.utils/atomos.utils.core/src/main/java/org/apache/felix/atomos/utils/core/plugins/finaliser/shade/ShaderPlugin.java
@@ -29,7 +29,6 @@
 import java.util.jar.JarFile;
 import java.util.jar.JarOutputStream;
 import java.util.jar.Manifest;
-import java.util.stream.Collectors;
 
 import org.apache.felix.atomos.utils.api.Context;
 import org.apache.felix.atomos.utils.api.FileType;
@@ -71,17 +70,17 @@ public void doFinal(Context context)
         {
 
             List<Path> classpath = context.getFiles(FileType.ARTIFACT,
-                FileType.INDEX_JAR).collect(Collectors.toList());
+                FileType.INDEX_JAR);
             classpath.forEach(p -> {
                 try
                 {
                     JarFile jar = new JarFile(p.toFile());
                     map.put(jar, p);
                     jar.stream()//
-                        .filter(Predicate.not(JarEntry::isDirectory))//
-                        .forEach(je -> {
-                            compute(je.getName()).add(jar);
-                        });
+                    .filter(Predicate.not(JarEntry::isDirectory))//
+                    .forEach(je -> {
+                        compute(je.getName()).add(jar);
+                    });
                 }
                 catch (IOException e)
                 {
@@ -128,9 +127,9 @@ public void doFinal(Context context)
                                 System.out.println("-- List of Jars:");
 
                                 v.stream().map(map::get)//
-                                    .map(Path::toAbsolutePath)//
-                                    .map(p -> "-- " + p.toString())//
-                                    .forEach(System.out::println);
+                                .map(Path::toAbsolutePath)//
+                                .map(p -> "-- " + p.toString())//
+                                .forEach(System.out::println);
 
                             });
                         }
@@ -150,7 +149,7 @@ public void doFinal(Context context)
         }
         catch (
 
-        Exception e)
+            Exception e)
         {
             e.printStackTrace();
         }
diff --git a/atomos.utils/atomos.utils.core/src/test/java/org/apache/felix/atomos/utils/core/TestContext.java b/atomos.utils/atomos.utils.core/src/test/java/org/apache/felix/atomos/utils/core/TestContext.java
index 03ed35b1..1a2ba5ff 100644
--- a/atomos.utils/atomos.utils.core/src/test/java/org/apache/felix/atomos/utils/core/TestContext.java
+++ b/atomos.utils/atomos.utils.core/src/test/java/org/apache/felix/atomos/utils/core/TestContext.java
@@ -15,11 +15,10 @@
 
 import java.nio.file.Path;
 import java.util.List;
-import java.util.stream.Stream;
 
+import org.apache.felix.atomos.utils.api.Context;
 import org.apache.felix.atomos.utils.api.FileType;
 import org.apache.felix.atomos.utils.api.RegisterServiceCall;
-import org.apache.felix.atomos.utils.api.Context;
 import org.apache.felix.atomos.utils.substrate.api.dynproxy.DynamicProxyConfiguration;
 import org.apache.felix.atomos.utils.substrate.api.reflect.ReflectionConfiguration;
 import org.apache.felix.atomos.utils.substrate.api.resource.ResourceConfiguration;
@@ -96,7 +95,7 @@ default void addResourceConfig(ResourceConfiguration resourceConfig)
     }
 
     @Override
-    default Stream<Path> getFiles(FileType... fileType)
+    default List<Path> getFiles(FileType... fileType)
     {
         return null;
     }