diff --git a/bopytex/bopytex.py b/bopytex/bopytex.py
index d324c59..24fefa4 100755
--- a/bopytex/bopytex.py
+++ b/bopytex/bopytex.py
@@ -11,7 +11,8 @@ import logging
 
 from pathlib import Path
 import pytex
-from mapytex import Expression, Integer, Decimal
+#from mapytex import Expression, Integer, Decimal, random_list
+import mapytex
 import bopytex.filters as filters
 
 formatter = logging.Formatter("%(name)s :: %(levelname)s :: %(message)s")
@@ -24,19 +25,16 @@ logger.addHandler(steam_handler)
 
 
 def setup():
-    Expression.set_render("tex")
-    logger.debug(f"Render for Expression is {Expression.RENDER}")
+    mapytex.Expression.set_render("tex")
+    logger.debug(f"Render for Expression is {mapytex.Expression.RENDER}")
     mapytex_tools = {
-        "Expression": Expression,
-        "Integer": Integer,
-        "Decimal": Decimal,
-        # "Polynom": mapytex.Polynom,
-        # "Fraction": mapytex.Fraction,
-        # "Equation": mapytex.Equation,
-        # "random_str": mapytex.random_str,
-        # "random_pythagore": mapytex.random_pythagore,
-        # "Dataset": mapytex.Dataset,
-        # "WeightedDataset": mapytex.WeightedDataset,
+        "Expression": mapytex.Expression,
+        "Integer": mapytex.Integer,
+        "Decimal": mapytex.Decimal,
+        "random_list": mapytex.random_list,
+        "random_pythagore": mapytex.random_pythagore,
+        "Dataset": mapytex.Dataset,
+        "WeightedDataset": mapytex.WeightedDataset,
     }
     pytex.update_export_dict(mapytex_tools)
 
diff --git a/setup.py b/setup.py
index 5c2f353..b1cddb8 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ from setuptools import setup
 
 setup(
     name='Bopytex',
-    version='0.1.2',
+    version='0.2',
     description='Command line tool for compiling latex with python command embedded',
     author='Benjamin Bertrand',
     author_email='programming@opytex.org',