diff --git a/README.md b/README.md
index ffff967..3e0f620 100644
--- a/README.md
+++ b/README.md
@@ -11,19 +11,52 @@ Due to the fact that the PDF text and metadata are stored inside the note they a
 ## Usage
 
 Fill in the required values for the options.
-![Image](assets/JoplinOptions.png)
-
+### regular options
+![Image](assets/JoplinOptionsSimple.png)
+### advanced options
+![Image](assets/JoplinOptionsAdvanced.png)
 And copy PDF files inside the import path to start working.
 
 ## How it works
-These plugin imort files from certain folders, specified inside the settings. For pdf files it will extract some meta data if there as well as text stored inside the pdf (OCR must be done by the scanner application) and stores the text inside a comment block of the note itself.
+These plugin imort files from certain folders, specified inside the settings. For pdf files it will extract some meta data if there as well as text stored inside the pdf (OCR must be done by the scanner application) and stores the text inside a yaml code block of the note itself.
+![Image](assets/Athena_in_action.png)
 
 ## Format in Note
+The format of importat files is:
 
+``` markdown
+# 2022-12-03-simple-test-document.pdf
+[2022-12-03-simple-test-document.pdf](:/450edcc8f9894a3c888f729b0ad87f21)
 
+# metadata
+```
+````
+``` yaml document header
+Name: 2022-12-03-simple-test-document
+Author: ""
+Content: |
+  Part I
+  Lorem ipsum dolor sit amet
+  1  Lorem
+  ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor inci-
+  didunt ut labore et dolore magna aliqua. Nibh sed pulvinar proin gravida.
+  1
+Sender: ""
+Captured: 2022-12-03T13:10:12.124Z
+Created: 2022-12-03T13:09:12.000Z
+FileHash:
+  Algorithm: sha512
+  Hash: 16f6a18bc0797fb235e465bc6475516996911372c5bfe06b6af9180d29bcde95c611027614a4a1d4511a453fe918431016c113b9e42d594ec900138c51b3ad6a
+Metadata: null
+Modified: 2022-12-03T13:09:12.000Z
+Recipient: ""
+ResourceLink: "[2022-12-03-simple-test-document.pdf](:/450edcc8f9894a3c888f729b0ad87f21)"
 
-## Old style (Add function to auto migrate)
+```
+````
 
+## Old style (deprecated)
+The old style can be migrated by a command by selecting multiple notes.
 ```xml
 <!--
 PDFMETADATATEXTSTART
@@ -51,13 +84,9 @@ For the time being the meta data of files is stored inside the note as comment b
 
 ## Roadmap
 
-- [x] Research on better location for metadata and pdf text
 - [ ] Show import status in a status bar with progress
 - [ ] Improve tag handling on import (will be moved to other plugin)
 - [ ] Integrate OCR
-~~ - [ ] Integrate Import of already existing Resources (attached to notes)~~
-- [x] Build on export of files to a special folder for backups (archive directory)
-~~ - [ ] Handle email attachments (other plugin)~~
 - [ ] and a lot more
 
 ## Misc
diff --git a/assets/2022-12-03-complex-test-document.lyx b/assets/2022-12-03-complex-test-document.lyx
new file mode 100644
index 0000000..d9b71c6
--- /dev/null
+++ b/assets/2022-12-03-complex-test-document.lyx
@@ -0,0 +1,313 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 544
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_title "Lorem ipsum dolor sit amet"
+\pdf_author "makaanneo"
+\pdf_subject "Lorem ipsum dolor sit amet"
+\pdf_keywords "Lorem ipsum dolor sit amet, test"
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks true
+\pdf_pdfborder true
+\pdf_colorlinks true
+\pdf_backref false
+\pdf_pdfusetitle true
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Part
+Lorem ipsum dolor sit amet
+\end_layout
+
+\begin_layout Section
+Lorem
+\end_layout
+
+\begin_layout Standard
+ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+ incididunt ut labore et dolore magna aliqua.
+ Nibh sed pulvinar proin gravida.
+ Mattis rhoncus urna neque viverra justo nec ultrices dui.
+ Purus ut faucibus pulvinar elementum integer enim.
+ Egestas egestas fringilla phasellus faucibus scelerisque.
+ Aliquam eleifend mi in nulla posuere sollicitudin aliquam ultrices.
+ Sodales neque sodales ut etiam sit amet.
+ Eu lobortis elementum nibh tellus.
+ Auctor urna nunc id cursus metus.
+ Vel turpis nunc eget lorem dolor sed.
+ Odio eu feugiat pretium nibh ipsum consequat.
+ Fames ac turpis egestas integer eget.
+ Nulla aliquet enim tortor at auctor urna nunc id cursus.
+ Ipsum nunc aliquet bibendum enim.
+ Ut faucibus pulvinar elementum integer.
+ Eleifend donec pretium vulputate sapien nec sagittis.
+ Orci a scelerisque purus semper eget duis at tellus.
+ Integer vitae justo eget magna.
+ Tincidunt ornare massa eget egestas purus viverra.
+\end_layout
+
+\begin_layout Subsection
+Varius
+\end_layout
+
+\begin_layout Standard
+sit amet mattis vulputate enim.
+ Feugiat sed lectus vestibulum mattis ullamcorper velit.
+ Id velit ut tortor pretium viverra suspendisse potenti.
+ Faucibus a pellentesque sit amet.
+ Laoreet sit amet cursus sit.
+ Neque volutpat ac tincidunt vitae semper.
+ Ultricies leo integer malesuada nunc vel risus commodo.
+ Ipsum a arcu cursus vitae congue mauris.
+ Posuere ac ut consequat semper viverra nam.
+ Ultrices neque ornare aenean euismod elementum.
+ Ullamcorper eget nulla facilisi etiam dignissim diam.
+ A erat nam at lectus urna duis convallis convallis tellus.
+ Adipiscing vitae proin sagittis nisl.
+ Nunc mattis enim ut tellus.
+ In fermentum posuere urna nec tincidunt praesent semper.
+ Aliquam ut porttitor leo a diam sollicitudin tempor id.
+ Enim nulla aliquet porttitor lacus.
+\end_layout
+
+\begin_layout Subsection
+Volutpat
+\end_layout
+
+\begin_layout Standard
+commodo sed egestas egestas fringilla phasellus.
+ Dolor sed viverra ipsum nunc aliquet bibendum enim.
+ Praesent tristique magna sit amet.
+ Egestas congue quisque egestas diam in arcu cursus euismod quis.
+ Tortor posuere ac ut consequat semper viverra nam libero justo.
+ Sagittis orci a scelerisque purus.
+ Eget dolor morbi non arcu risus quis varius.
+ Lectus vestibulum mattis ullamcorper velit sed ullamcorper morbi tincidunt
+ ornare.
+ Sit amet nisl purus in mollis nunc.
+ Proin sed libero enim sed.
+ Mi in nulla posuere sollicitudin aliquam ultrices sagittis orci.
+ Massa placerat duis ultricies lacus.
+ Consequat ac felis donec et odio pellentesque.
+\end_layout
+
+\begin_layout Section
+Consectetur
+\end_layout
+
+\begin_layout Standard
+a erat nam at lectus urna.
+ Tellus id interdum velit laoreet id donec ultrices tincidunt.
+ Magnis dis parturient montes nascetur ridiculus mus mauris.
+ Ipsum dolor sit amet consectetur.
+ Faucibus a pellentesque sit amet porttitor.
+ Leo duis ut diam quam nulla porttitor massa id neque.
+ Bibendum ut tristique et egestas quis ipsum suspendisse.
+ Sit amet purus gravida quis blandit turpis cursus.
+ Condimentum mattis pellentesque id nibh tortor id.
+ Amet massa vitae tortor condimentum lacinia quis vel eros donec.
+ Congue quisque egestas diam in arcu.
+ Ullamcorper dignissim cras tincidunt lobortis feugiat vivamus.
+ Tortor consequat id porta nibh venenatis cras.
+ Iaculis nunc sed augue lacus.
+ Praesent semper feugiat nibh sed pulvinar proin gravida.
+ Libero enim sed faucibus turpis in eu.
+ Et malesuada fames ac turpis egestas maecenas pharetra convallis posuere.
+ Id ornare arcu odio ut sem nulla pharetra.
+\end_layout
+
+\begin_layout Section
+Tortor
+\end_layout
+
+\begin_layout Standard
+consequat id porta nibh venenatis cras sed.
+ Libero volutpat sed cras ornare arcu dui.
+ Mauris cursus mattis molestie a iaculis at erat pellentesque.
+ Sed lectus vestibulum mattis ullamcorper velit sed.
+ Vitae sapien pellentesque habitant morbi tristique senectus et.
+ Sit amet aliquam id diam maecenas.
+ Mollis nunc sed id semper.
+ Cras sed felis eget velit.
+ Amet luctus venenatis lectus magna fringilla.
+ Nec feugiat nisl pretium fusce id velit ut.
+ Dictum sit amet justo donec enim diam vulputate.
+ Risus ultricies tristique nulla aliquet enim tortor.
+ Vel pharetra vel turpis nunc eget lorem dolor.
+ Sit amet commodo nulla facilisi nullam vehicula.
+ In pellentesque massa placerat duis ultricies.
+ Accumsan tortor posuere ac ut consequat semper viverra.
+ Magna etiam tempor orci eu lobortis elementum.
+ Amet aliquam id diam maecenas ultricies mi eget.
+ Laoreet sit amet cursus sit amet dictum sit amet justo.
+ Ornare arcu dui vivamus arcu felis bibendum ut.
+\end_layout
+
+\begin_layout Standard
+In eu mi bibendum neque egestas congue quisque egestas.
+ In tellus integer feugiat scelerisque varius.
+ Vel fringilla est ullamcorper eget nulla facilisi etiam dignissim.
+ Tristique risus nec feugiat in fermentum posuere urna nec tincidunt.
+ Sagittis purus sit amet volutpat consequat.
+ Quam viverra orci sagittis eu volutpat odio facilisis mauris.
+ Leo vel orci porta non pulvinar neque laoreet.
+ Eget felis eget nunc lobortis mattis aliquam faucibus.
+ Varius quam quisque id diam vel quam elementum pulvinar etiam.
+ Id donec ultrices tincidunt arcu non.
+ Sit amet luctus venenatis lectus.
+ Sit amet mauris commodo quis imperdiet massa tincidunt.
+\end_layout
+
+\begin_layout Subsection
+Amet
+\end_layout
+
+\begin_layout Standard
+nisl purus in mollis nunc sed id.
+ Ipsum dolor sit amet consectetur adipiscing elit ut aliquam.
+ Habitasse platea dictumst quisque sagittis purus sit amet volutpat consequat.
+ Justo eget magna fermentum iaculis eu non diam phasellus.
+ Massa tempor nec feugiat nisl pretium fusce id velit.
+ Arcu dui vivamus arcu felis bibendum ut.
+ Nunc sed velit dignissim sodales.
+ Turpis tincidunt id aliquet risus feugiat in.
+ Mollis nunc sed id semper risus in hendrerit gravida rutrum.
+ Enim tortor at auctor urna.
+\end_layout
+
+\begin_layout Standard
+Massa sed elementum tempus egestas sed sed.
+ Urna et pharetra pharetra massa massa ultricies mi.
+ Faucibus in ornare quam viverra.
+ Nibh sed pulvinar proin gravida hendrerit lectus.
+ Ante metus dictum at tempor commodo.
+ Id cursus metus aliquam eleifend mi in nulla.
+ Pulvinar mattis nunc sed blandit libero volutpat.
+ Ut eu sem integer vitae justo eget magna.
+ Sapien faucibus et molestie ac feugiat sed lectus.
+ Ornare aenean euismod elementum nisi quis eleifend quam adipiscing.
+ Semper eget duis at tellus at.
+ Risus ultricies tristique nulla aliquet.
+ Tincidunt dui ut ornare lectus sit amet.
+ Consectetur purus ut faucibus pulvinar elementum integer.
+ Et malesuada fames ac turpis egestas integer eget aliquet nibh.
+ Eget magna fermentum iaculis eu non diam phasellus vestibulum.
+ Odio euismod lacinia at quis risus sed vulputate.
+ Egestas purus viverra accumsan in nisl.
+ Nunc aliquet bibendum enim facilisis gravida neque convallis.
+ Eu tincidunt tortor aliquam nulla facilisi cras fermentum odio.
+\end_layout
+
+\begin_layout Subsubsection
+Purus
+\end_layout
+
+\begin_layout Standard
+in massa tempor nec feugiat.
+ Id aliquet risus feugiat in ante.
+ Morbi non arcu risus quis varius quam quisque.
+ Arcu dui vivamus arcu felis bibendum ut.
+ Amet mattis vulputate enim nulla.
+ Sollicitudin ac orci phasellus egestas tellus rutrum.
+ Semper feugiat nibh sed pulvinar proin gravida hendrerit lectus.
+ Tortor id aliquet lectus proin.
+ Commodo odio aenean sed adipiscing diam donec adipiscing tristique risus.
+ Quam adipiscing vitae proin sagittis nisl rhoncus mattis.
+ Facilisis leo vel fringilla est ullamcorper.
+ Massa enim nec dui nunc mattis enim ut.
+\end_layout
+
+\begin_layout Standard
+Vitae ultricies leo integer malesuada nunc vel risus commodo viverra.
+ Quam vulputate dignissim suspendisse in.
+ Aliquet nec ullamcorper sit amet risus nullam.
+ Dui nunc mattis enim ut tellus elementum.
+ Turpis egestas maecenas pharetra convallis.
+ Maecenas volutpat blandit aliquam etiam erat velit scelerisque in dictum.
+ Et pharetra pharetra massa massa ultricies mi quis.
+ Pharetra convallis posuere morbi leo urna molestie.
+ Duis ut diam quam nulla porttitor massa id.
+ Ut tristique et egestas quis.
+ Ultrices neque ornare aenean euismod elementum nisi.
+ Sagittis orci a scelerisque purus semper eget duis.
+ Massa tincidunt nunc pulvinar sapien et ligula ullamcorper.
+ Id donec ultrices tincidunt arcu non sodales neque sodales.
+\end_layout
+
+\end_body
+\end_document
diff --git a/assets/2022-12-03-complex-test-document.pdf b/assets/2022-12-03-complex-test-document.pdf
new file mode 100644
index 0000000..cd3a66e
Binary files /dev/null and b/assets/2022-12-03-complex-test-document.pdf differ
diff --git a/assets/2022-12-03-simple-test-document.lyx b/assets/2022-12-03-simple-test-document.lyx
new file mode 100644
index 0000000..a8ea12d
--- /dev/null
+++ b/assets/2022-12-03-simple-test-document.lyx
@@ -0,0 +1,93 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 544
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Part
+Lorem ipsum dolor sit amet
+\end_layout
+
+\begin_layout Section
+Lorem
+\end_layout
+
+\begin_layout Standard
+ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+ incididunt ut labore et dolore magna aliqua.
+ Nibh sed pulvinar proin gravida.
+\end_layout
+
+\end_body
+\end_document
diff --git a/assets/2022-12-03-simple-test-document.pdf b/assets/2022-12-03-simple-test-document.pdf
new file mode 100644
index 0000000..9621342
Binary files /dev/null and b/assets/2022-12-03-simple-test-document.pdf differ
diff --git a/assets/Athena_in_action.png b/assets/Athena_in_action.png
new file mode 100644
index 0000000..1ba4e77
Binary files /dev/null and b/assets/Athena_in_action.png differ
diff --git a/assets/JoplinOptionsAdvanced.png b/assets/JoplinOptionsAdvanced.png
new file mode 100644
index 0000000..1b93d17
Binary files /dev/null and b/assets/JoplinOptionsAdvanced.png differ
diff --git a/assets/JoplinOptionsSimple.png b/assets/JoplinOptionsSimple.png
new file mode 100644
index 0000000..bb4f58f
Binary files /dev/null and b/assets/JoplinOptionsSimple.png differ
diff --git a/src/core/archiveFile.ts b/src/core/archiveFile.ts
index b6010bd..54505b4 100644
--- a/src/core/archiveFile.ts
+++ b/src/core/archiveFile.ts
@@ -69,14 +69,16 @@ export class archiveFile implements iArchiveFile {
   ): Promise<string> {
     const baseName = path.basename(fileName);
     const extension = path.extname(baseName);
-    const clean = baseName.replace(extension, '');
-    let target = path.join(archivePath, clean);
+    const clean = baseName.replaceAll(extension, '');
+    let target = path.join(archivePath, `${clean}${extension}`);
     if (fs.existsSync(target)) {
       const newFileName = `${clean}-(${await this.getFileNameNoise(
         clean,
         archivePath
       )})${fileExtension}`;
       target = path.join(archivePath, newFileName);
+      console.log('target file name for archive');
+      console.log(target);
       fs.moveSync(sourceFile, target, { overwrite: false });
     } else {
       fs.moveSync(sourceFile, target, { overwrite: true });
diff --git a/src/core/defaultFileHandler.ts b/src/core/defaultFileHandler.ts
index a56883f..b334b26 100644
--- a/src/core/defaultFileHandler.ts
+++ b/src/core/defaultFileHandler.ts
@@ -41,7 +41,7 @@ export class defaultFileHandler
   async extension(): Promise<Array<string>> {
     return this._supported;
   }
-  async loadFile(filePath: string): Promise<rawFile> {
+  async loadFile(filePath: string): Promise<iRawFile> {
     const fileStats = fs.statSync(filePath);
     const file: iRawFile = new rawFile();
     file.Name = path.basename(filePath);
diff --git a/src/core/fileTypeProcessor.ts b/src/core/fileTypeProcessor.ts
index c61956d..6855a8d 100644
--- a/src/core/fileTypeProcessor.ts
+++ b/src/core/fileTypeProcessor.ts
@@ -25,7 +25,7 @@ export class fileTypeProcessor implements iFileTypeProcessor {
     const handler: iFileTypeHandler = await this._factory.getTypeHandler(
       filePath
     );
-    const file: rawFile = await handler.loadFile(filePath);
+    const file: iRawFile = await handler.loadFile(filePath);
     return file;
   }
 }
diff --git a/src/core/migrateFileImportFormatV1toV2.ts b/src/core/migrateFileImportFormatV1toV2.ts
index 7b727d0..f41381d 100644
--- a/src/core/migrateFileImportFormatV1toV2.ts
+++ b/src/core/migrateFileImportFormatV1toV2.ts
@@ -52,8 +52,8 @@ export class migrateFileImportFormatV1toV2
     while (result === '' && indexOfFILEHASHEND !== -1) {
       result = body
         .substring(indexOfFILEHASHSTART, indexOfFILEHASHEND)
-        .replace(startToken, '')
-        .replace(endToken, '');
+        .replaceAll(startToken, '')
+        .replaceAll(endToken, '');
       if (result !== '') {
         break;
       }
@@ -83,31 +83,31 @@ export class migrateFileImportFormatV1toV2
       if (value.includes('Title:')) {
         title = value
           .substring(value.indexOf(':') + 1)
-          .replace(EOL, '')
+          .replaceAll(EOL, '')
           .trim();
       }
       if (value.includes('Subject:')) {
         subject = value
           .substring(value.indexOf(':') + 1)
-          .replace(EOL, '')
+          .replaceAll(EOL, '')
           .trim();
       }
       if (value.includes('Author:')) {
         author = value
           .substring(value.indexOf(':') + 1)
-          .replace(EOL, '')
+          .replaceAll(EOL, '')
           .trim();
       }
       if (value.includes('CreationDate:')) {
         creationDate = value
           .substring(value.indexOf(':') + 1)
-          .replace(EOL, '')
+          .replaceAll(EOL, '')
           .trim();
       }
       if (value.includes('Keywords:')) {
         keywords = value
           .substring(value.indexOf(':') + 1)
-          .replace(EOL, '')
+          .replaceAll(EOL, '')
           .trim();
       }
     });
@@ -131,8 +131,8 @@ export class migrateFileImportFormatV1toV2
     while (result === '' && indexOfFILEHASHEND !== -1) {
       result = body
         .substring(indexOfFILEHASHSTART, indexOfFILEHASHEND)
-        .replace(startToken, '')
-        .replace(endToken, '');
+        .replaceAll(startToken, '')
+        .replaceAll(endToken, '');
       if (result !== '') {
         break;
       }
@@ -152,12 +152,12 @@ export class migrateFileImportFormatV1toV2
     while (result === '' && indexOfFILEHASHEND !== -1) {
       result = body
         .substring(indexOfFILEHASHSTART, indexOfFILEHASHEND)
-        .replace(startToken, '')
-        .replace(endToken, '')
-        .replace(EOL, '')
-        .replace('\n', '');
+        .replaceAll(startToken, '')
+        .replaceAll(endToken, '')
+        .replaceAll(EOL, '')
+        .replaceAll('\n', '');
       if (result !== '') {
-        result = result.replace('\n', '');
+        result = result.replaceAll('\n', '');
         break;
       }
       offset = indexOfFILEHASHEND + endToken.length;
diff --git a/src/core/pdfTypeHandler.ts b/src/core/pdfTypeHandler.ts
index 4ce2157..fdda1d5 100644
--- a/src/core/pdfTypeHandler.ts
+++ b/src/core/pdfTypeHandler.ts
@@ -5,7 +5,6 @@ import { pdf } from '../pdf/pdf';
 import path = require('path');
 import { rawFile, iRawFile } from './rawFile';
 import { typeHandlerBase, iFileTypeHandler } from './typeHandlerBase';
-import { Console } from 'console';
 
 @injectable()
 export class pdfTypeHandler
@@ -36,7 +35,7 @@ export class pdfTypeHandler
     support.push('pdf');
     return support;
   }
-  async loadFile(filePath: string): Promise<rawFile> {
+  async loadFile(filePath: string): Promise<iRawFile> {
     const pdfFullText = await this._pdf.extractPdfText(filePath);
     const metaInformation = await this._pdf.extractPdfMetadata(filePath);
     const file: iRawFile = new rawFile();
diff --git a/src/core/plainTextFileHandler.ts b/src/core/plainTextFileHandler.ts
index 99f993f..42a4988 100644
--- a/src/core/plainTextFileHandler.ts
+++ b/src/core/plainTextFileHandler.ts
@@ -34,7 +34,7 @@ export class plainTextFileHandler
   async extension(): Promise<Array<string>> {
     return this._supported;
   }
-  async loadFile(filePath: string): Promise<rawFile> {
+  async loadFile(filePath: string): Promise<iRawFile> {
     let fileBuffer: Buffer;
     const fileStats = fs.statSync(filePath);
     try {
diff --git a/src/core/rawFile.ts b/src/core/rawFile.ts
index b2b539b..93f642b 100644
--- a/src/core/rawFile.ts
+++ b/src/core/rawFile.ts
@@ -16,7 +16,13 @@ export class rawFile implements iRawFile {
   Name: string;
   Extension: string;
   Metadata: metaData;
-  Content: string;
+  private _content = '';
+  get Content(): string {
+    return this._content;
+  }
+  set Content(value: string) {
+    this._content = value.replaceAll('\r', '');
+  }
   FileHash: string;
   FullPath: string;
   Captured: Date;
@@ -24,7 +30,7 @@ export class rawFile implements iRawFile {
   async fileNameWithoutExtension(fullFileName: string): Promise<string> {
     const fileName = path.basename(fullFileName);
     const fileExt = path.extname(fullFileName);
-    const withOutExtension = fileName.replace(fileExt, '');
+    const withOutExtension = fileName.replaceAll(fileExt, '');
     return withOutExtension;
   }
 }
diff --git a/src/core/typeHandlerBase.ts b/src/core/typeHandlerBase.ts
index 54a544c..19e79f2 100644
--- a/src/core/typeHandlerBase.ts
+++ b/src/core/typeHandlerBase.ts
@@ -1,13 +1,13 @@
 import { iAthenaConfiguration } from '../settings/athenaConfiguration';
 import fs = require('fs-extra');
 import crypto = require('crypto');
-import { rawFile } from './rawFile';
 import { injectable } from 'inversify';
+import { iRawFile } from './rawFile';
 
 export interface iFileTypeHandler {
   canHandle(fileExtension: string): Promise<boolean>;
   extension(): Promise<string[]>;
-  loadFile(filePath: string): Promise<rawFile>;
+  loadFile(filePath: string): Promise<iRawFile>;
 }
 
 @injectable()
diff --git a/tsconfig.json b/tsconfig.json
index 4ae2826..b6941e3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,7 @@
     "strict": false,
     "declaration": true,
     "sourceMap": true,
-    "lib": ["es6"],
+    "lib": ["es6", "ES2021.String"],
     "types": ["reflect-metadata"],
     "moduleResolution": "node",
     "experimentalDecorators": true,