diff --git a/doc/rtd/conf.py b/doc/rtd/conf.py
index 3d9464e..75ee9cf 100644
--- a/doc/rtd/conf.py
+++ b/doc/rtd/conf.py
@@ -18,11 +18,11 @@
 # -- Project information -----------------------------------------------------
 
 project = 'MLPro Documentations'
-copyright = '2024 South Westphalia University of Applied Sciences, Germany'
+copyright = '2025 South Westphalia University of Applied Sciences, Germany'
 author = 'Detlef Arend, Steve Yuwono, Laxmikant Shrikant Baheti et al'
 
 # The full version, including alpha/beta/rc tags
-release = '1.0.0'
+release = '1.0.1'
 
 
 # -- General configuration ---------------------------------------------------
@@ -85,4 +85,4 @@ def setup(app):
   'github_user': 'fhswf',
   'github_repo': 'MLPro-Int-Optuna',
   'github_version': 'main/doc/docs/',
-}
\ No newline at end of file
+}
diff --git a/doc/rtd/requirements.txt b/doc/rtd/requirements.txt
index 23cfce9..c58eec1 100644
--- a/doc/rtd/requirements.txt
+++ b/doc/rtd/requirements.txt
@@ -1,4 +1,4 @@
-mlpro[full]>=1.4.0
+mlpro[full]>=2.1.0
 optuna>=3.4.0
 
 sphinxcontrib-napoleon
diff --git a/requirements.txt b/requirements.txt
index b257799..0d0d594 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
-mlpro[full] >= 1.4.0
-optuna >= 3.4.0
\ No newline at end of file
+mlpro[full] >= 2.1.0
+optuna >= 3.4.0
diff --git a/setup.cfg b/setup.cfg
index 4f9f519..375c396 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = mlpro_int_optuna
-version = 1.0.0
+version = 1.0.1
 author = MLPro Team
 author_email = mlpro@listen.fh-swf.de
 description = MLPro: Integration Optuna
@@ -18,7 +18,7 @@ classifiers =
 package_dir =
     = src
 packages = find:
-python_requires = >=3.10
+python_requires = >=3.11
 include_package_data = True
 
 [options.packages.find]
@@ -26,5 +26,5 @@ where = src
 
 [options.extras_require]
 full =
-    mlpro[full] >= 1.4.0
+    mlpro[full] >= 2.1.0
     optuna >= 3.4.0
diff --git a/src/mlpro_int_optuna/__init__.py b/src/mlpro_int_optuna/__init__.py
index 63b6a44..fff7b7d 100644
--- a/src/mlpro_int_optuna/__init__.py
+++ b/src/mlpro_int_optuna/__init__.py
@@ -1 +1 @@
-from mlpro_int_optuna.wrappers import WrHPTOptuna
\ No newline at end of file
+from .wrappers import *
diff --git a/src/mlpro_int_optuna/wrappers/__init__.py b/src/mlpro_int_optuna/wrappers/__init__.py
index bcc847d..cc48add 100644
--- a/src/mlpro_int_optuna/wrappers/__init__.py
+++ b/src/mlpro_int_optuna/wrappers/__init__.py
@@ -1 +1 @@
-from mlpro_int_optuna.wrappers.optuna import WrHPTOptuna
\ No newline at end of file
+from .optuna import *
diff --git a/src/mlpro_int_optuna/wrappers/optuna.py b/src/mlpro_int_optuna/wrappers/optuna.py
index f4128a2..a52d9f5 100644
--- a/src/mlpro_int_optuna/wrappers/optuna.py
+++ b/src/mlpro_int_optuna/wrappers/optuna.py
@@ -13,10 +13,11 @@
 ## -- 2022-10-17  1.1.1     SY       Refactoring due to unit test
 ## -- 2024-01-31  2.0.0     LSB      Migrated Optuna to new repo MLPro-Int-Optuna
 ## -- 2024-04-18  2.1.0     DA       Alignment with MLPro 1.4.0
+## -- 2025-08-03  2.1.1     SY       Refactoring
 ## -------------------------------------------------------------------------------------------------
 
 """
-Ver. 2.1.0. (2024-04-18)
+Ver. 2.1.1 (2025-08-03)
 
 This module provides a wrapper class for hyperparameter tuning by reusing Optuna framework.
 
@@ -26,13 +27,18 @@
 
 import optuna
 from mlpro.wrappers import Wrapper
+from mlpro.bf import *
 from mlpro.bf.ml import *
 from mlpro.bf.math import *
+from mlpro.bf.data import *
 from mlpro.bf.various import *
-from mlpro.rl.models import *
+from mlpro.rl import *
 from mlpro.gt import *
 import os
 
+# Export list for public API
+__all__ = ['WrHPTOptuna']
+
 
 ## -------------------------------------------------------------------------------------------------
 ## -------------------------------------------------------------------------------------------------
diff --git a/src/setup.py b/src/setup.py
index 38ba375..aa35f6a 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -2,7 +2,7 @@
 
 
 setup(name='mlpro_int_optuna',
-version='1.0.0',
+version='1.0.1',
 description='MLPro: Integration Optuna',
 author='MLPro Team',
 author_mail='mlpro@listen.fh-swf.de',
@@ -12,9 +12,9 @@
 # Package dependencies for full installation
 extras_require={
     "full": [
-        "mlpro>=1.4.0",
+        "mlpro>=2.1.0",
         "optuna>=3.4.0"
     ],
 },
 
-zip_safe=False)
\ No newline at end of file
+zip_safe=False)
diff --git a/test/howtos/rl/howto_rl_ht_001_optuna.py b/test/howtos/rl/howto_rl_ht_001_optuna.py
index 7a2fa8c..f4efe62 100644
--- a/test/howtos/rl/howto_rl_ht_001_optuna.py
+++ b/test/howtos/rl/howto_rl_ht_001_optuna.py
@@ -36,8 +36,14 @@
 from mlpro_int_optuna import WrHPTOptuna
 from mlpro.rl.pool.envs.bglp import BGLP
 from mlpro.rl import *
+from mlpro.bf import *
+from mlpro.bf.math import *
+from mlpro.bf.systems import *
+from mlpro.bf.plot import *
+from mlpro.bf.ml import *
 import random
 from pathlib import Path
+import numpy as np
 
 
 ## -------------------------------------------------------------------------------------------------
diff --git a/test/test_examples.py b/test/test_examples.py
index af502cd..09a1f79 100644
--- a/test/test_examples.py
+++ b/test/test_examples.py
@@ -59,7 +59,7 @@
 
 import sys
 import os
-from mlpro.bf.various import Log
+from mlpro.bf import *
 import runpy
 import pytest