diff --git a/src/cli/commands/crypto.ts b/src/cli/commands/crypto.ts
index ae41c8e..479460a 100644
--- a/src/cli/commands/crypto.ts
+++ b/src/cli/commands/crypto.ts
@@ -11,6 +11,9 @@ import { DependencyFilter } from '../../sdk/tree/Filters/DependencyFilter';
 import { CryptoCfg } from '../../sdk/Cryptography/CryptoCfg';
 import fs from 'fs';
 import { BinaryFilter } from '../../sdk/tree/Filters/BinaryFilter';
+import { ScanFilter } from '../../sdk/tree/Filters/ScanFilter';
+import { FilterAND } from '../../sdk/tree/Filters/FilterAND';
+import { isBinaryFileSync } from 'isbinaryfile';
 
 export async function cryptoHandler(rootPath: string, options: any): Promise<void> {
   rootPath = rootPath.replace(/\/$/, '');  // Remove trailing slash if exists
@@ -31,7 +34,7 @@ export async function cryptoHandler(rootPath: string, options: any): Promise<voi
   if (pathIsFolder) {
     const tree = new Tree(rootPath);
     tree.build();
-    fileList = tree.getFileList(new BinaryFilter());
+    fileList = tree.getFileList(new FilterAND([new BinaryFilter(), new ScanFilter('')]));
   }
 
   console.log("Searching for local cryptography...")
diff --git a/src/sdk/tree/Filters/FilterAND.ts b/src/sdk/tree/Filters/FilterAND.ts
new file mode 100644
index 0000000..6041d76
--- /dev/null
+++ b/src/sdk/tree/Filters/FilterAND.ts
@@ -0,0 +1,22 @@
+import Node from "../Node";
+import { Filter } from "./Filter";
+
+export class FilterAND extends Filter {
+
+    private filters: Array<Filter>;
+
+    constructor(filters: Array<Filter>) {
+        super();
+        this.filters =  filters;
+    }
+
+    public evaluate(node: Node): boolean {
+       let valid = false;
+       for(let i = 0; i < this.filters.length; i++) {
+           valid = this.filters[i].evaluate(node);
+           if(!valid) return false;
+        }
+        return valid;
+    }
+
+}