diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 5276e1a..c90e9b6 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -19,9 +19,10 @@
     <select />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="6d538012-f92f-483f-b3e1-d7f3fcd6b66b" name="Default Changelist" comment="Updated module description.&#10;Added support for when EEEG will use classes to identify entities + fallback to ids.">
+    <list default="true" id="6d538012-f92f-483f-b3e1-d7f3fcd6b66b" name="Default Changelist" comment="Release prep">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/scripts/lib/CityImporter.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/CityImporter.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/lib/ImportWindow.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/lib/ImportWindow.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/scripts/module.js" beforeDir="false" afterPath="$PROJECT_DIR$/scripts/module.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -116,7 +117,11 @@
       <workItem from="1608325483020" duration="762000" />
       <workItem from="1608570302713" duration="169000" />
       <workItem from="1608571110754" duration="8000" />
-      <workItem from="1611388411989" duration="2634000" />
+      <workItem from="1611388411989" duration="2956000" />
+      <workItem from="1611686021191" duration="1242000" />
+      <workItem from="1612459248021" duration="119000" />
+      <workItem from="1612716865551" duration="9000" />
+      <workItem from="1613817441993" duration="709000" />
     </task>
     <task id="LOCAL-00001" summary="Init">
       <created>1604937546780</created>
@@ -293,7 +298,14 @@
       <option name="project" value="LOCAL" />
       <updated>1611390671092</updated>
     </task>
-    <option name="localTasksCounter" value="26" />
+    <task id="LOCAL-00026" summary="Release prep">
+      <created>1611391307811</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1611391307811</updated>
+    </task>
+    <option name="localTasksCounter" value="27" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -338,6 +350,7 @@
     <MESSAGE value="descriptive fix" />
     <MESSAGE value="maybe sidebar fix?" />
     <MESSAGE value="Updated module description.&#10;Added support for when EEEG will use classes to identify entities + fallback to ids." />
-    <option name="LAST_COMMIT_MESSAGE" value="Updated module description.&#10;Added support for when EEEG will use classes to identify entities + fallback to ids." />
+    <MESSAGE value="Release prep" />
+    <option name="LAST_COMMIT_MESSAGE" value="Release prep" />
   </component>
 </project>
\ No newline at end of file
diff --git a/module.json b/module.json
index 11db5f7..bdcd0eb 100644
--- a/module.json
+++ b/module.json
@@ -2,9 +2,9 @@
   "name": "EEEG-Importer",
   "title": "EEEG-Importer",
   "description": "A module that allows you to import your cities generated with Eigengrau's Generator into a collection of journal entries.",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "minimumCoreVersion": "0.7.6",
-  "compatibleCoreVersion": "0.7.8",
+  "compatibleCoreVersion": "0.8.0",
   "author": "HadaIonut",
   "dependencies": [
 
diff --git a/scripts/lib/ImportWindow.js b/scripts/lib/ImportWindow.js
index ba08521..0fc7154 100644
--- a/scripts/lib/ImportWindow.js
+++ b/scripts/lib/ImportWindow.js
@@ -5,6 +5,11 @@ const prepareDisplayName = (folder) => {
     return prepareDisplayName(game.folders.get(folder.data.parent)) + '/' + folder.data.name;
 }
 
+const isFoundry8 = () => {
+    const foundryVersion = game.data.version;
+    return foundryVersion >= '0.8.0' && foundryVersion < '0.9.0';
+}
+
 export default class ImportWindow extends Application {
 
     static get defaultOptions() {
@@ -26,7 +31,7 @@ export default class ImportWindow extends Application {
         const locationSelector = html.find("#customLocation");
         const locationSelectorActors = html.find('#customLocationActor');
 
-        const folders = game.folders.entries;
+        const folders = isFoundry8() ? game.folders : game.folders.entries;
 
         folders.forEach((folder) => {
             if (folder.data.type === 'JournalEntry')
diff --git a/scripts/module.js b/scripts/module.js
index 73d3e51..b527057 100644
--- a/scripts/module.js
+++ b/scripts/module.js
@@ -11,3 +11,4 @@ Hooks.on("renderSidebarTab", async (app, html) => {
         html.find(".header-actions").after(buttonDiv);
     }
 })
+