1 files changed, 34 insertions, 2 deletions

diff --git a/src/Model/Folder/EnhancedFolder.js b/src/Model/Folder/EnhancedFolder.js
index 4198d61..fbec6ce 100644
--- a/src/Model/Folder/EnhancedFolder.js
+++ b/src/Model/Folder/EnhancedFolder.js
@@ -22,17 +22,49 @@ export default class EnhancedFolder extends Folder {
 
     /**
      *
-     * @returns {Promise<Folder[]>}
+     * @returns {Promise<FolderCollection[]>}
      */
     async fetchRevisions() {
+        if(this.getProperty('revisions') === undefined) {
+            await this._api.getFolderRepository().findById(this.getId(), 'revisions');
+        }
 
+        return this.getProperty('revisions');
     }
 
     /**
      *
-     * @returns {Promise<Password[]>}
+     * @returns {Promise<PasswordCollection[]>}
      */
     async fetchPasswords() {
+        if(this.getProperty('passwords') === undefined) {
+            await this._api.getFolderRepository().findById(this.getId(), 'passwords');
+        }
+
+        return this.getProperty('passwords');
+    }
+
+    /**
+     *
+     * @returns {Promise<FolderCollection[]>}
+     */
+    async fetchFolders() {
+        if(this.getProperty('folders') === undefined) {
+            await this._api.getFolderRepository().findById(this.getId(), 'folders');
+        }
+
+        return this.getProperty('folders');
+    }
+
+    /**
+     *
+     * @returns {Promise<Folder[]>}
+     */
+    async fetchParent() {
+        if(this.getProperty('parent') === undefined) {
+            await this._api.getFolderRepository().findById(this.getId(), 'parent');
+        }
 
+        return this.getProperty('parent');
     }
 }
\ No newline at end of file