diff --git a/findmyorder/handler/__init__.py b/findmyorder/handler/__init__.py
index 65bc9b1..9047ec9 100644
--- a/findmyorder/handler/__init__.py
+++ b/findmyorder/handler/__init__.py
@@ -1,9 +1,9 @@
 """
-
+Supported Handlers
 
 """
 
-# from .basic import BasicHandler
+from .basic import BasicHandler
 from .standard import StandardHandler
 
-__all__ = ["StandardHandler"]
+__all__ = ["StandardHandler", "BasicHandler"]
diff --git a/findmyorder/main.py b/findmyorder/main.py
index 8dc2a92..083c308 100644
--- a/findmyorder/main.py
+++ b/findmyorder/main.py
@@ -111,7 +111,7 @@ def _create_client(self, **kwargs):
 
         """
         library = kwargs.get("parser_library", "standard")
-        cls = self.client_classes.get(library.capitalize())
+        cls = self.client_classes.get((f"{library.capitalize()}Handler"))
         return None if cls is None else cls(**kwargs)
 
     def get_all_client_classes(self):