diff --git a/src/ast.js b/src/ast.js
index 772dbcc..f507c19 100644
--- a/src/ast.js
+++ b/src/ast.js
@@ -1,35 +1,35 @@
-const fs = require("fs");
-const parser = require("@babel/parser");
-const t = require("@babel/types");
-
-class AST {
-    static filenameToAST = (filename) => {
-      try {
-        const content = fs.readFileSync(filename, "utf-8");
-        return parser.parse(content, { sourceType: "module" });
-      } catch (error) {
-        return null;
-      }
-    };
-    
-    static getSpecifierType(specifier) {
-      if (specifier.local.name === "default")
-      {
-        return "default";
-      } else return "named";
-    }
-  
-    static createASTImportDeclaration = ({name: specifierName, path: modulePath, type: specifierType}) => {
-      return t.importDeclaration(
-        [
-          specifierType === "named"
-            ? t.importSpecifier(t.identifier(specifierName),t.identifier(specifierName))
-            : t.importDefaultSpecifier(t.identifier(specifierName))
-          ,
-        ],
-        t.stringLiteral(modulePath)
-      )
-    }  
-  }
-
+const fs = require("fs");
+const parser = require("@babel/parser");
+const t = require("@babel/types");
+
+class AST {
+    static filenameToAST = (filename) => {
+      try {
+        const content = fs.readFileSync(filename, "utf-8");
+        return parser.parse(content, { sourceType: "module" });
+      } catch (error) {
+        return null;
+      }
+    };
+    
+    static getSpecifierType(specifier) {
+      if (specifier.local.name === "default")
+      {
+        return "default";
+      } else return "named";
+    }
+
+    static createASTImportDeclaration = ({exportedName: specifierLocalName, localName: specifierImportedName, path: modulePath, type: specifierType}) => {
+      return t.importDeclaration(
+        [
+          specifierType === "named"
+            ? t.importSpecifier(t.identifier(specifierLocalName),t.identifier(specifierImportedName))
+            : t.importDefaultSpecifier(t.identifier(specifierLocalName))
+          ,
+        ],
+        t.stringLiteral(modulePath)
+      )
+    }  
+  }
+
 module.exports = AST;
\ No newline at end of file
diff --git a/src/barrel.js b/src/barrel.js
index 91067f9..59514a2 100644
--- a/src/barrel.js
+++ b/src/barrel.js
@@ -1,157 +1,160 @@
-const t = require("@babel/types");
-const ospath = require("path");
-const fs = require("fs");
-const AST = require("./ast");
-
-class PathFunctions {
-  static isRelativePath(path) {
-    return path.match(/^\.{0,2}\//);
-  }
-  
-  static isLocalModule(importModulePath) {
-    try {
-      return !!require.resolve(importModulePath) && !importModulePath.includes("node_modules");
-    } catch {
-      return false;
-    }
-  }
-  
-  static isScriptFile(importModulePath) {
-    return importModulePath.match(/\.(js|mjs|jsx|ts|tsx)$/);
-  }
-  
-  static getBaseUrlFromTsconfig() {
-    try {
-      const filename = ospath.resolve("jsconfig.json");
-      const content = JSON.parse(fs.readFileSync(filename, "utf-8"));
-      return content?.["compilerOptions"]?.["baseUrl"] || "./";
-    } catch (error) {
-      throw error;
-    }
-  }
-  
-  static getModuleFile(filenameImportFrom, modulePath) {
-  // solution for require function for ES modules
-  // https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules
-  // https://stackoverflow.com/a/50053801
-  // import { createRequire } from "module";
-  // const require = createRequire(import.meta.url);
-    try {
-      const filenameDir = ospath.dirname(filenameImportFrom);
-      const basePath = PathFunctions.isRelativePath(modulePath) ? 
-        filenameDir : ospath.resolve(PathFunctions.getBaseUrlFromTsconfig());
-      return require.resolve(ospath.resolve(basePath, modulePath));  
-    } catch {
-      try {
-        return require.resolve(modulePath);
-      } catch {
-        return "MODULE_NOT_FOUND";
-      }
-    }
-  }  
-}
-
-
-class BarrelFilesMapping {
-  constructor() {
-    this.mapping = {};
-  }
-
-  static isBarrelFile(modulePath) {
-    return modulePath.endsWith("index.js");
-  }
-
-  verifyFilePath (importModuleAbsolutePath) {
-    return !BarrelFilesMapping.isBarrelFile(importModuleAbsolutePath) || !PathFunctions.isLocalModule(importModuleAbsolutePath) || !PathFunctions.isScriptFile(importModuleAbsolutePath)
-  }  
-
-  createSpecifiersMapping(fullPathModule) {
-    const barrelAST = AST.filenameToAST(fullPathModule);
-    this.mapping[fullPathModule] = {};
-    barrelAST.program.body.forEach((node) => {
-      if (t.isExportNamedDeclaration(node)) {
-        const originalExportedPath = node.source?.value || fullPathModule;
-        const absoluteExportedPath = node.source?.value ? PathFunctions.getModuleFile(fullPathModule, originalExportedPath) : fullPathModule;
-        node.specifiers.forEach((specifier) => {
-          const specifierName = specifier.exported.name;
-          const specifierType = AST.getSpecifierType(specifier);
-          this.mapping[fullPathModule][specifierName] =
-            this.createDirectSpecifierObject(absoluteExportedPath, specifierName, specifierType);
-        });
-        if (t.isVariableDeclaration(node.declaration)) {
-          const specifierType = "named";
-          node.declaration.declarations.forEach((declaration) => {
-            const specifierName = declaration.id.name;
-            this.mapping[fullPathModule][specifierName] =
-              this.createDirectSpecifierObject(absoluteExportedPath, specifierName, specifierType);    
-          });
-        } else if (t.isFunctionDeclaration(node.declaration)) {
-          const specifierType = "named";
-          const specifierName = node.declaration.id.name;
-          this.mapping[fullPathModule][specifierName] =
-            this.createDirectSpecifierObject(absoluteExportedPath, specifierName, specifierType);
-        }
-      } else if (t.isExportAllDeclaration(node)) {
-        const originalExportedPath = node.source.value;
-        const absoluteExportedPath = PathFunctions.getModuleFile(fullPathModule, originalExportedPath);
-        if (!this.mapping[absoluteExportedPath]) {
-          this.createSpecifiersMapping(absoluteExportedPath);
-        }
-        Object.assign(this.mapping[fullPathModule],this.mapping[absoluteExportedPath]);
-      }
-    });
-  }
-
-  createDirectSpecifierObject(fullPathModule, specifierName, specifierType) {
-    if (BarrelFilesMapping.isBarrelFile(fullPathModule)) {
-      if (!this.mapping[fullPathModule]) {
-        this.createSpecifiersMapping(fullPathModule);
-      }
-      const originalPath = this.mapping[fullPathModule][specifierName]["path"];
-      const originalName = this.mapping[fullPathModule][specifierName]["name"];
-      const originalType = this.mapping[fullPathModule][specifierName]["type"];
-      return this.createDirectSpecifierObject(originalPath, originalName, originalType);
-    }
-    return {
-      name: specifierName,
-      path: fullPathModule,
-      type: specifierType,
-    };
-  }
-
-  getDirectSpecifierObject(fullPathModule, specifierName) {
-    if (!this.mapping[fullPathModule]) {
-      this.createSpecifiersMapping(fullPathModule);
-    }
-    return this.mapping[fullPathModule][specifierName];
-  }
-}
-
-const mapping = new BarrelFilesMapping();
-
-const importDeclarationVisitor = (path, state) => {
-  const parsedJSFile = state.filename
-  const originalImportsPath = path.node.source.value;
-  const originalImportsSpecifiers = path.node.specifiers;
-  // const importModulePath = resolve.sync(originalImports.source.value,{basedir: ospath.dirname(state.filename)});
-  const importModuleAbsolutePath = PathFunctions.getModuleFile(parsedJSFile, originalImportsPath);
-  if (mapping.verifyFilePath(importModuleAbsolutePath)) return;
-  const directSpecifierASTArray = originalImportsSpecifiers.map(
-    (specifier) => {
-      const directSpecifierObject = mapping.getDirectSpecifierObject(
-        importModuleAbsolutePath,
-        specifier.imported.name
-      );
-      return AST.createASTImportDeclaration(directSpecifierObject);
-    }
-  );
-  path.replaceWithMultiple(directSpecifierASTArray);
-};
-
-module.exports = function (babel) {
-  return {
-    visitor: {
-      ImportDeclaration: importDeclarationVisitor,
-    },
-  };
-};
+const t = require("@babel/types");
+const ospath = require("path");
+const fs = require("fs");
+const AST = require("./ast");
+
+class PathFunctions {
+  static isRelativePath(path) {
+    return path.match(/^\.{0,2}\//);
+  }
+  
+  static isLocalModule(importModulePath) {
+    try {
+      return !!require.resolve(importModulePath) && !importModulePath.includes("node_modules");
+    } catch {
+      return false;
+    }
+  }
+  
+  static isScriptFile(importModulePath) {
+    return importModulePath.match(/\.(js|mjs|jsx|ts|tsx)$/);
+  }
+  
+  static getBaseUrlFromTsconfig() {
+    try {
+      const filename = ospath.resolve("jsconfig.json");
+      const content = JSON.parse(fs.readFileSync(filename, "utf-8"));
+      return content?.["compilerOptions"]?.["baseUrl"] || "./";
+    } catch (error) {
+      throw error;
+    }
+  }
+  
+  static getModuleFile(filenameImportFrom, modulePath) {
+  // solution for require function for ES modules
+  // https://stackoverflow.com/questions/54977743/do-require-resolve-for-es-modules
+  // https://stackoverflow.com/a/50053801
+  // import { createRequire } from "module";
+  // const require = createRequire(import.meta.url);
+    try {
+      const filenameDir = ospath.dirname(filenameImportFrom);
+      const basePath = PathFunctions.isRelativePath(modulePath) ? 
+        filenameDir : ospath.resolve(PathFunctions.getBaseUrlFromTsconfig());
+      return require.resolve(ospath.resolve(basePath, modulePath));  
+    } catch {
+      try {
+        return require.resolve(modulePath);
+      } catch {
+        return "MODULE_NOT_FOUND";
+      }
+    }
+  }  
+}
+
+
+class BarrelFilesMapping {
+  constructor() {
+    this.mapping = {};
+  }
+
+  static isBarrelFile(modulePath) {
+    return modulePath.endsWith("index.js");
+  }
+
+  verifyFilePath (importModuleAbsolutePath) {
+    return !BarrelFilesMapping.isBarrelFile(importModuleAbsolutePath) || !PathFunctions.isLocalModule(importModuleAbsolutePath) || !PathFunctions.isScriptFile(importModuleAbsolutePath)
+  }  
+
+  createSpecifiersMapping(fullPathModule) {
+    const barrelAST = AST.filenameToAST(fullPathModule);
+    this.mapping[fullPathModule] = {};
+    barrelAST.program.body.forEach((node) => {
+      if (t.isExportNamedDeclaration(node)) {
+        const originalExportedPath = node.source?.value || fullPathModule;
+        const absoluteExportedPath = node.source?.value ? PathFunctions.getModuleFile(fullPathModule, originalExportedPath) : fullPathModule;
+        node.specifiers.forEach((specifier) => {
+          const specifierExportedName = specifier.exported.name;
+          const specifierLocalName = specifier?.local?.name;
+          const specifierType = AST.getSpecifierType(specifier);
+          this.mapping[fullPathModule][specifierExportedName] =
+            this.createDirectSpecifierObject(absoluteExportedPath, specifierExportedName, specifierLocalName, specifierType);
+        });
+        if (t.isVariableDeclaration(node.declaration)) {
+          const specifierType = "named";
+          node.declaration.declarations.forEach((declaration) => {
+            const specifierName = declaration.id.name;
+            this.mapping[fullPathModule][specifierName] =
+              this.createDirectSpecifierObject(absoluteExportedPath, specifierName, specifierType);    
+          });
+        } else if (t.isFunctionDeclaration(node.declaration)) {
+          const specifierType = "named";
+          const specifierName = node.declaration.id.name;
+          this.mapping[fullPathModule][specifierName] =
+            this.createDirectSpecifierObject(absoluteExportedPath, specifierName, specifierType);
+        }
+      } else if (t.isExportAllDeclaration(node)) {
+        const originalExportedPath = node.source.value;
+        const absoluteExportedPath = PathFunctions.getModuleFile(fullPathModule, originalExportedPath);
+        if (!this.mapping[absoluteExportedPath]) {
+          this.createSpecifiersMapping(absoluteExportedPath);
+        }
+        Object.assign(this.mapping[fullPathModule],this.mapping[absoluteExportedPath]);
+      }
+    });
+  }
+
+  createDirectSpecifierObject(fullPathModule, specifierExportedName, specifierLocalName, specifierType) {
+    if (BarrelFilesMapping.isBarrelFile(fullPathModule)) {
+      if (!this.mapping[fullPathModule]) {
+        this.createSpecifiersMapping(fullPathModule);
+      }
+      const originalPath = this.mapping[fullPathModule][specifierExportedName]["path"];
+      const originalExportedName = this.mapping[fullPathModule][specifierExportedName]["exportedName"];
+      const originalLocalName = this.mapping[fullPathModule][specifierExportedName]["localName"];
+      const originalType = this.mapping[fullPathModule][specifierExportedName]["type"];
+      return this.createDirectSpecifierObject(originalPath, originalExportedName, originalLocalName, originalType);
+    }
+    return {
+      exportedName: specifierExportedName,
+      localName: specifierLocalName,
+      path: fullPathModule,
+      type: specifierType,
+    };
+  }
+
+  getDirectSpecifierObject(fullPathModule, specifierExportedName) {
+    if (!this.mapping[fullPathModule]) {
+      this.createSpecifiersMapping(fullPathModule);
+    }
+    return this.mapping[fullPathModule][specifierExportedName];
+  }
+}
+
+const mapping = new BarrelFilesMapping();
+
+const importDeclarationVisitor = (path, state) => {
+  const parsedJSFile = state.filename
+  const originalImportsPath = path.node.source.value;
+  const originalImportsSpecifiers = path.node.specifiers;
+  // const importModulePath = resolve.sync(originalImports.source.value,{basedir: ospath.dirname(state.filename)});
+  const importModuleAbsolutePath = PathFunctions.getModuleFile(parsedJSFile, originalImportsPath);
+  if (mapping.verifyFilePath(importModuleAbsolutePath)) return;
+  const directSpecifierASTArray = originalImportsSpecifiers.map(
+    (specifier) => {
+      const directSpecifierObject = mapping.getDirectSpecifierObject(
+        importModuleAbsolutePath,
+        specifier.imported.name
+      );
+      return AST.createASTImportDeclaration(directSpecifierObject);
+    }
+  );
+  path.replaceWithMultiple(directSpecifierASTArray);
+};
+
+module.exports = function (babel) {
+  return {
+    visitor: {
+      ImportDeclaration: importDeclarationVisitor,
+    },
+  };
+};