diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileCollection.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileCollection.java
index f673b6b4e..33a94a095 100644
--- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileCollection.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileCollection.java
@@ -13,16 +13,13 @@
 package org.eclipse.passage.lic.base.io;
 
 import java.io.IOException;
-import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.internal.base.i18n.BaseMessages;
@@ -43,34 +40,10 @@ public FileCollection(Supplier<Path> base, PassageFileExtension extension) {
 	}
 
 	public Collection<Path> get() throws LicensingException {
-		HunterFiles hunter = new HunterFiles(extensions);
-		try {
-			Files.walkFileTree(base.get(), hunter);
+		try (Stream<Path> files = Files.walk(base.get()).filter(Files::isRegularFile)) {
+			return files.filter(extensions::ends).collect(Collectors.toList());
 		} catch (IOException e) {
-			new LicensingException(BaseMessages.getString("FileCollection.failure"), e); //$NON-NLS-1$
+			throw new LicensingException(BaseMessages.getString("FileCollection.failure"), e); //$NON-NLS-1$
 		}
-		return hunter.findings();
-	}
-
-	private static final class HunterFiles extends SimpleFileVisitor<Path> {
-		private final List<Path> findings = new ArrayList<>();
-		private final PassageFileExtension extension;
-
-		HunterFiles(PassageFileExtension extension) {
-			this.extension = extension;
-		}
-
-		@Override
-		public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-			if (file.getFileName().toString().endsWith(extension.get())) {
-				findings.add(file);
-			}
-			return FileVisitResult.CONTINUE;
-		}
-
-		Collection<Path> findings() {
-			return findings;
-		}
-
 	}
 }
diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileContent.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileContent.java
index 5384a0c6a..9bbc1abba 100644
--- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileContent.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileContent.java
@@ -12,9 +12,7 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.base.io;
 
-import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
@@ -32,10 +30,6 @@ public FileContent(Path file) {
 	}
 
 	public byte[] get() throws IOException {
-		byte[] content = new byte[(int) Files.size(file)];
-		try (InputStream stream = new FileInputStream(file.toFile())) {
-			stream.read(content);
-		}
-		return content;
+		return Files.readAllBytes(file);
 	}
 }
diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileKeyKeeper.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileKeyKeeper.java
index 11a45ac63..914f2b051 100644
--- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileKeyKeeper.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/FileKeyKeeper.java
@@ -12,7 +12,6 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.base.io;
 
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -44,7 +43,7 @@ public LicensedProduct id() {
 	@Override
 	public InputStream productPublicKey() throws LicensingException {
 		try {
-			return new FileInputStream(key.toFile());
+			return Files.newInputStream(key);
 		} catch (Exception e) {
 			throw new LicensingException(e);
 		}
diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java
index efacc3cd6..4a9b9d862 100644
--- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/PathKeyKeeper.java
@@ -12,8 +12,8 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.base.io;
 
-import java.io.FileInputStream;
 import java.io.InputStream;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Objects;
 import java.util.function.Supplier;
@@ -47,7 +47,7 @@ public LicensedProduct id() {
 	public InputStream productPublicKey() throws LicensingException {
 		Path path = base.get().resolve(keyFile());
 		try {
-			return new FileInputStream(path.toFile());
+			return Files.newInputStream(path);
 		} catch (Exception e) {
 			throw new LicensingException(//
 					String.format(//
diff --git a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/Settings.java b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/Settings.java
index c9b5e949b..9b47d1763 100644
--- a/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/Settings.java
+++ b/bundles/org.eclipse.passage.lic.base/src/org/eclipse/passage/lic/base/io/Settings.java
@@ -12,21 +12,16 @@
  *******************************************************************************/
 package org.eclipse.passage.lic.base.io;
 
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Properties;
-import java.util.Set;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.stream.Stream;
 
 import org.eclipse.passage.lic.api.LicensingException;
 import org.eclipse.passage.lic.internal.base.i18n.BaseMessages;
@@ -66,49 +61,30 @@ public Settings(Supplier<Path> base) {
 	}
 
 	public Map<String, Object> get() throws LicensingException {
-		HunterForSettingsFiles hunter = new HunterForSettingsFiles();
-		try {
-			Files.walkFileTree(base.get(), hunter);
+		try (Stream<Path> files = getSettingFilesIn(base.get())) {
+			Map<String, Object> properties = new HashMap<>();
+			for (Path file : (Iterable<Path>) files::iterator) {
+				loadAndAdd(properties, file);
+				if (enough.test(properties)) {
+					return properties;
+				}
+			}
+			return properties;
 		} catch (IOException e) {
 			throw new LicensingException(String.format(BaseMessages.getString("Settings.error_on_reading_settings"), //$NON-NLS-1$
 					base.get()), e);
 		}
-		return hunter.findings();
 	}
 
-	private final class HunterForSettingsFiles extends SimpleFileVisitor<Path> {
-
-		private final Map<String, Object> properties;
-		private final PassageFileExtension extension = new PassageFileExtension.Settings();
-
-		public HunterForSettingsFiles() {
-			this.properties = new HashMap<String, Object>();
-		}
-
-		@Override
-		public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-			if (!extension.ends(file)) {
-				return FileVisitResult.CONTINUE;
-			}
-			load(file).stream() //
-					.forEach(e -> properties.put(//
-							e.getKey().toString(), //
-							e.getValue()));
-			return enough.test(properties) ? FileVisitResult.TERMINATE : FileVisitResult.CONTINUE;
-		}
+	private Stream<Path> getSettingFilesIn(Path path) throws IOException {
+		return Files.walk(path).filter(Files::isRegularFile).filter(new PassageFileExtension.Settings()::ends);
+	}
 
-		private Set<Entry<Object, Object>> load(Path file) throws IOException {
-			Properties heap = new Properties();
-			try (InputStream stream = new FileInputStream(file.toFile())) {
-				heap.load(stream);
-			}
-			return heap.entrySet();
+	private void loadAndAdd(Map<String, Object> properties, Path settingsFile) throws IOException {
+		Properties heap = new Properties();
+		try (InputStream stream = Files.newInputStream(settingsFile)) {
+			heap.load(stream);
 		}
-
-		Map<String, Object> findings() {
-			return properties;
-		}
-
+		heap.forEach((k, v) -> properties.put(k.toString(), v));
 	}
-
 }