@@ -70,9 +70,9 @@ def importResource(resourceName, resourceModuleName=None) :
             log.warning(importResource, f'Not possible to import "{resourceName}" resource from "{resourceModuleName}" module. Going for a second attempt')
             try :
                 module = importlib.import_module(resourceModuleName)
-            except :
+            except Exception as exception:
                 module = None
-                log.warning(importResource, f'Not possible to import "{resourceName}" resource from "{resourceModuleName}" module in the second attempt either')
+                log.error(importResource, f'Not possible to import "{resourceName}" resource from "{resourceModuleName}" module in the second attempt either', exception)
         if module :
             try :
                 resource = getattr(module, resourceName)
 
@@ -2,22 +2,27 @@
 from python_helper import Constant as c
 from python_helper import StringHelper
 
-def getDocumentationFilePath(globals):
-    g = globals
-    return f'{g.apiPath}api{g.OS_SEPARATOR}resource{g.OS_SEPARATOR}swaggerui{g.OS_SEPARATOR}swagger.json'
+KW_OPEN_API = 'swagger'
+KW_JSON = 'json'
+DOCUMENTATION_FILE = f'{KW_OPEN_API}{c.DOT}{KW_JSON}'
 
-def loadDocumentationAsString(globals):
-    documentationFilePath = getDocumentationFilePath(globals)
-    with open(documentationFilePath, globals.READ, encoding=globals.ENCODING) as documentationFile :
+def getDocumentationFilePath(apiInstance):
+    # return f'{g.apiPath}api{g.OS_SEPARATOR}resource{g.OS_SEPARATOR}swaggerui{g.OS_SEPARATOR}swagger.json'
+    return f'{apiInstance.documentationFolder}{g.OS_SEPARATOR}swagger.json'
+
+def loadDocumentationAsString(apiInstance):
+    documentationFilePath = getDocumentationFilePath(apiInstance)
+    with open(documentationFilePathapiInstance.documentationFolder, globals.READ, encoding=globals.ENCODING) as documentationFile :
         documentationAsString = c.NOTHING.join(documentationFile.readlines())
     return documentationAsString
 
-def loadDocumentation(globals):
-    documentationAsString = loadDocumentationAsString(globals)
+def loadDocumentation(apiInstance):
+    documentationAsString = loadDocumentationAsString(apiInstance)
     return json.loads(documentationAsString)
 
-def overrideDocumentation(globals, documentation):
+def overrideDocumentation(apiInstance):
+    globals = apiInstance.globals
     documentationAsString = StringHelper.stringfyThisDictionary(documentation)
-    documentationFilePath = getDocumentationFilePath(globals)
+    documentationFilePath = getDocumentationFilePath(apiInstance)
     with open(documentationFilePath, globals.OVERRIDE, encoding=globals.ENCODING) as documentationFile :
         documentationFile.write(documentationAsString)
@@ -6,12 +6,10 @@
 from python_framework.api.src.service.openapi.OpenApiKey import Key as k
 from python_framework.api.src.service.openapi.OpenApiValue import Value as v
 from python_framework.api.src.service.openapi import OpenApiDocumentationFile
+from python_framework.api.src.service.openapi.OpenApiDocumentationFile import KW_OPEN_API, KW_JSON, DOCUMENTATION_FILE
 
-KW_OPEN_API = 'swagger'
 KW_UI = 'ui'
-KW_JSON = 'json'
-OPEN_API_URL = f'/{KW_OPEN_API}'
-DOCUMENTATION_FILE = f'{KW_OPEN_API}{c.DOT}{KW_JSON}'
+OPEN_API_URL = f'/{OpenApiDocumentationFile.KW_OPEN_API}'
 COLON_DOUBLE_BAR = '://'
 LOCAL_HOST = 'localhost'
 
@@ -68,9 +66,10 @@ def addSwagger(appInstance, apiInstance):
         documentationUrl,
         DOCUMENTATION_FILE
     )
+    # appInstance.documentationFolder = swaggerUi._static_folder
     swaggerUi._static_folder = f'{globals.currentPath}{KW_API}{globals.OS_SEPARATOR}{KW_RESOURCE}{globals.OS_SEPARATOR}{KW_OPEN_API}{KW_UI}{globals.OS_SEPARATOR}'
     appInstance.register_blueprint(swaggerUi, url_prefix=documentationUrl)
-    OpenApiDocumentationFile.overrideDocumentation(globals, apiInstance.documentation)
+    OpenApiDocumentationFile.overrideDocumentation(apiInstance)
 
 ################################################################################
 
 
@@ -1,6 +1,6 @@
 from distutils.core import setup
 
-version = '0.0.1-11'
+version = '0.0.1-12'
 name = 'python_framework'
 url = f'https://github.com/SamuelJansen/{name}/'