diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index ae39812..4790c9f 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -28,4 +28,4 @@ jobs:
         cache: 'npm'
     - run: npm ci
     - run: npm run build --if-present
-    - run: npm test
+    - run: npm test
\ No newline at end of file
diff --git a/lib/directory-tree.js b/lib/directory-tree.js
index b056437..0677c4e 100644
--- a/lib/directory-tree.js
+++ b/lib/directory-tree.js
@@ -80,7 +80,7 @@ function directoryTree (path, options, onEachFile, onEachDirectory) {
       options = { ...options, symlinks: [] };
     // Skip if a cyclic symbolic link has been found
     if (options.symlinks.find(ino => ino === lstat.ino)) {
-      return null; 
+      return null;
     } else {
       options.symlinks.push(lstat.ino);
     }
@@ -94,13 +94,20 @@ function directoryTree (path, options, onEachFile, onEachDirectory) {
     if (options.extensions && !options.extensions.test(ext))
       return null;
 
-    item.size = stats.size;  // File size in bytes
-    item.extension = ext;
-    item.type = constants.FILE;
 
     if (options.attributes) {
       options.attributes.forEach((attribute) => {
-        item[attribute] = stats[attribute];
+        switch (attribute) {
+          case 'extension':
+            item.extension = ext;
+            break;
+          case 'type':
+            item.type = constants.FILE;
+            break;
+          default:
+            item[attribute] = stats[attribute];
+            break;
+        }
       });
     }
 
@@ -112,16 +119,29 @@ function directoryTree (path, options, onEachFile, onEachDirectory) {
     let dirData = safeReadDirSync(path);
     if (dirData === null) return null;
 
+    item.children = dirData
+      .map(child => directoryTree(PATH.join(path, child), options, onEachFile, onEachDirectory))
+      .filter(e => !!e);
+
     if (options.attributes) {
       options.attributes.forEach((attribute) => {
-        item[attribute] = stats[attribute];
+        switch (attribute) {
+          case 'size':
+            item.size = item.children.reduce((prev, cur) => prev + cur.size, 0);
+            break;
+          case 'type':
+            item.type = constants.DIRECTORY;
+            break;
+          case 'extension':
+            break;
+          default:
+            item[attribute] = stats[attribute];
+            break;
+        }
+        
       });
     }
-    item.children = dirData
-      .map(child => directoryTree(PATH.join(path, child), options, onEachFile, onEachDirectory))
-      .filter(e => !!e);
-    item.size = item.children.reduce((prev, cur) => prev + cur.size, 0);
-    item.type = constants.DIRECTORY;
+
     if (onEachDirectory) {
       onEachDirectory(item, path, stats);
     }
diff --git a/test/test.js b/test/test.js
index c80caaf..39ad51f 100644
--- a/test/test.js
+++ b/test/test.js
@@ -55,7 +55,7 @@ describe('directoryTree', () => {
   });
 
   it('should display the size of a directory (summing up the children)', () => {
-    const tree = dirtree('./test/test_data', {extensions:/\.txt$/});
+    const tree = dirtree('./test/test_data', {extensions:/\.txt$/, attributes: ['size']});
     expect(tree.size).to.be.above(11000);
   });
 
@@ -65,7 +65,7 @@ describe('directoryTree', () => {
   });
 
   it('should return the correct exact result', () => {
-    const tree = dirtree('./test/test_data', {normalizePath: true, followSymlinks: false });
+    const tree = dirtree('./test/test_data', {normalizePath: true, followSymlinks: false, attributes: ['size','type','extension'] });
     expect(tree).to.deep.equal(testTree);
   });
 
@@ -80,12 +80,12 @@ describe('directoryTree', () => {
   })
 
   it('should exclude the correct folders', () => {
-    const tree = dirtree('./test/test_data',{exclude: /another_dir/, normalizePath: true, followSymlinks: false});
+    const tree = dirtree('./test/test_data',{exclude: /another_dir/, normalizePath: true, followSymlinks: false, attributes: ['size','type','extension']});
     expect(tree).to.deep.equal(excludeTree);
   });
 
   it('should exclude multiple folders', () => {
-    const tree = dirtree('./test/test_data', {exclude: [/another_dir/, /some_dir_2/], normalizePath: true, followSymlinks: false});
+    const tree = dirtree('./test/test_data', {exclude: [/another_dir/, /some_dir_2/], normalizePath: true, followSymlinks: false, attributes: ['size','type','extension']});
     expect(tree).to.deep.equal(excludeTree2);
 
   });
@@ -101,7 +101,7 @@ describe('directoryTree', () => {
   });
 
   it('should follow symlinks', () => {
-    const tree = dirtree('./test/test_data', {normalizePath: true, followSymlinks: true });
+    const tree = dirtree('./test/test_data', {normalizePath: true, followSymlinks: true, attributes: ['size','type','extension'] });
     expect(tree).to.deep.equal(symlinkTree);
   })