diff --git a/database/Database.js b/database/Database.js
index 4927de8f..1bbfbd1d 100644
--- a/database/Database.js
+++ b/database/Database.js
@@ -3,15 +3,16 @@ import Languages  from '../data/Languages.js'
 
 export default class Database {
 
-  components = new Components
+  components = []
+
+  index = new Components
 
   languages = new Languages
 
   async initialize() {
-
     await this.languages.load()
-    await this.components.load()
-
+    await this.index.load()
+    this.components = Array.from(this.index.values())
   }
 
   search(filterFunction) {