diff --git a/findmyorder/default_settings.toml b/findmyorder/default_settings.toml
index f5595f8..256dbfb 100644
--- a/findmyorder/default_settings.toml
+++ b/findmyorder/default_settings.toml
@@ -23,7 +23,7 @@ findmyorder_enabled = true
 parser_library = "standard"
 enabled = true
 # Keyword to be use to identify an order
-action_identifier = "BUY SELL LONG SHORT"
+action_identifier = "BUY SELL LONG SHORT DEFAULT"
 # Keyword identifier for stoploss
 stop_loss_identifier = "sl="
 # Keyword identifier for take-profit
diff --git a/findmyorder/handler/handler.py b/findmyorder/handler/handler.py
index e924a77..c775c7b 100644
--- a/findmyorder/handler/handler.py
+++ b/findmyorder/handler/handler.py
@@ -25,6 +25,9 @@ def __init__(self, **kwargs):
         self.name = kwargs.get("name", None)
         self.client = None
         self.enabled = kwargs.get("enabled", None)
+        self.library = kwargs.get("library", None) or kwargs.get(
+            "parser_library", "standard"
+        )
         self.action_identifier = kwargs.get("action_identifier", "BUY SELL")
         self.action_identifier = self.action_identifier.lower()
         self.stop_loss_identifier = kwargs.get("stop_loss_identifier", None)
@@ -64,11 +67,7 @@ async def search(self, message: str) -> bool:
         """
         if message:
             order_identifier = message.split()[0].lower()
-            # logger.debug("Order identifier: {}", order_identifier)
-            # logger.debug("Action identifiers: {}", self.action_identifiers)
             if order_identifier in self.action_identifier:
-
-                # logger.debug("Order identifier found in {}", order_identifier)
                 return True
 
         return False
diff --git a/findmyorder/main.py b/findmyorder/main.py
index dafb0bd..1580e2f 100644
--- a/findmyorder/main.py
+++ b/findmyorder/main.py
@@ -45,13 +45,15 @@ def __init__(
         """
 
         self.enabled = settings.findmyorder_enabled
+        self.settings = settings.findmyorder
+        logger.debug("Settings: {}", self.settings)
         if not self.enabled:
             logger.info("Module is disabled. No Client will be created.")
             return
         self.client_classes = self.get_all_client_classes()
         self.clients = []
         # Create a client for each client in settings.findmyorder
-        for name, client_config in settings.findmyorder.items():
+        for name, client_config in self.settings.items():
             if (
                 # Skip empty client configs
                 client_config is None