diff --git a/cco/common/migration.py b/cco/common/migration.py
index 22505c2..98e01b0 100755
--- a/cco/common/migration.py
+++ b/cco/common/migration.py
@@ -1,23 +1,6 @@
-#
-#  Copyright (c) 2019 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+# cco.common.migration
 
-"""
-Base Class for imports.
+""" Base Class for imports.
 """
 
 from datetime import datetime, time
@@ -48,6 +31,212 @@ try:
     kwargs = dict(encoding='utf-8')
     if 'oracle' in dbengine:
         kwargs['coerce_to_unicode'] = True
+# cybertools.pyscript.script
+
+""" Simple implementation of Python scripts.
+"""
+
+import os, re
+#import compiler.pycodegen
+from io import StringIO
+from persistent import Persistent
+#import RestrictedPython.RCompile
+#from RestrictedPython.SelectCompiler import ast
+from zope.container.btree import BTreeContainer
+from zope.container.contained import Contained
+from zope.interface import implementer
+from zope.proxy import removeAllProxies
+#from zope.security.untrustedpython.builtins import SafeBuiltins
+#from zope.security.untrustedpython.rcompile import RestrictionMutator as BaseRM
+from zope.traversing.api import getParent, getPath
+
+from cybertools.pyscript.interfaces import IPythonScript, IScriptContainer
+
+HAS_R = use_R = bool(os.environ.get('USE_RLIBRARY', True))
+
+if use_R:
+    try:
+        #from cybertools.pyscript.rstat import r, rpy
+        import rpy
+        from rpy import r
+        HAS_R = True
+    except ImportError:
+        HAS_R = False
+
+
+unrestricted_objects = ('rpy', 'r', 'as_py', 'rstat')
+
+
+def compile(text, filename, mode):
+    if not isinstance(text, str):
+        raise TypeError("Compiled source must be string")
+    gen = RExpression(text, str(filename), mode)
+    gen.compile()
+    return gen.getCode()
+
+
+#class RExpression(RestrictedPython.RCompile.RestrictedCompileMode):
+class RExpression(object):
+
+    #CodeGeneratorClass = compiler.pycodegen.ExpressionCodeGenerator
+
+    def __init__(self, source, filename, mode="eval"):
+        self.mode = mode
+        RestrictedPython.RCompile.RestrictedCompileMode.__init__(
+            self, source, filename)
+        self.rm = RestrictionMutator()
+
+
+#class RestrictionMutator(BaseRM):
+class RestrictionMutator(object):
+
+    unrestricted_objects = unrestricted_objects
+
+    def visitGetattr(self, node, walker):
+        _getattr_name = ast.Name("getattr")
+        node = walker.defaultVisitNode(node)
+        if node.expr.name in self.unrestricted_objects:
+            return node     # no protection
+        return ast.CallFunc(_getattr_name,
+                            [node.expr, ast.Const(node.attrname)])
+
+
+@implementer(IPythonScript)
+class PythonScript(Contained, Persistent):
+    """Persistent Python Page - Content Type
+    """
+
+    _v_compiled = None
+
+    title = u''
+    parameters = u''
+    source = u''
+    contentType=u'text/plain'
+
+    def __init__(self, title=u'', parameters=u'', source=u'',
+                 contentType=u'text/plain'):
+        """Initialize the object."""
+        super(PythonScript, self).__init__()
+        self.title = title
+        self.source = source
+        self.contentType = contentType
+        self.parameters = parameters or u''
+
+    def __filename(self):
+        if self.__parent__ is None:
+            filename = 'N/A'
+        else:
+            filename = getPath(self)
+        return filename
+
+    def setSource(self, source):
+        """Set the source of the page and compile it.
+
+        This method can raise a syntax error, if the source is not valid.
+        """
+        self.__source = source
+        self.__prepared_source = self.prepareSource(source)
+        # Compile objects cannot be pickled
+        self._v_compiled = Function(self.__prepared_source,  self.parameters,
+                                    self.__filename())
+
+    _tripleQuotedString = re.compile(
+        r"^([ \t]*)[uU]?([rR]?)(('''|\"\"\")(.*)\4)", re.MULTILINE | re.DOTALL)
+
+    def prepareSource(self, source):
+        """Prepare source."""
+        # compile() don't accept '\r' altogether
+        source = source.replace("\r\n", "\n")
+        source = source.replace("\r", "\n")
+        if isinstance(source, unicode):
+            # Use special conversion function to work around
+            # compiler-module failure to handle unicode in literals
+            try:
+                source = source.encode('ascii')
+            except UnicodeEncodeError:
+                return self._tripleQuotedString.sub(_print_usrc, source)
+        return self._tripleQuotedString.sub(r"\1print \2\3", source)
+
+
+    def getSource(self):
+        """Get the original source code."""
+        return self.__source
+
+    source = property(getSource, setSource)
+
+    def __call__(self, request, *args, **kw):
+        output = StringIO()
+        if self._v_compiled is None:
+            self._v_compiled = Function(self.__prepared_source, self.parameters,
+                                        self.__filename(),)
+        parent = getParent(self)
+        kw['request'] = request
+        kw['script'] = self
+        kw['untrusted_output'] = kw['printed'] = output
+        kw['context'] = parent
+        kw['script_result'] = None
+        if IScriptContainer.providedBy(parent):
+            parent.updateGlobals(kw)
+        self._v_compiled(args, kw)
+        result = kw['script_result']
+        if result == output:
+            result = result.getvalue().decode('unicode-escape')
+        return result
+
+
+class Function(object):
+    """A compiled function.
+    """
+
+    parameters = []
+
+    def __init__(self, source, parameters='', filename='<string>'):
+        lines = []
+        if parameters:
+            self.parameters = [str(p).strip() for p in parameters.split(',')]
+        #print('*** Function.parameters:', repr(self.parameters))
+        lines.insert(0, 'def dummy(): \n    pass')
+        for line in source.splitlines():
+            lines.append('    ' + line)
+        lines.append('script_result = dummy()')
+        source = '\n'.join(lines)
+        #print('*** source:', source)
+        self.code = compile(source, filename, 'exec')
+
+    def __call__(self, args, globals):
+        globals['__builtins__'] = SafeBuiltins
+        for idx, p in enumerate(self.parameters):
+            # TODO: handle parameters with default values like ``attr=abc``
+            globals[p] = args[idx]
+        exec(self.code, globals, None)
+
+
+def _print_usrc(match):
+    string = match.group(3)
+    raw = match.group(2)
+    if raw:
+        #return match.group(1)+'print '+`string`
+        return match.group(1) + 'print(' + eval('string') + ')'
+    return match.group(1) + 'print(' + match.group(3).encode('unicode-escape') + ')'
+
+
+@implementer(IScriptContainer)
+class ScriptContainer(BTreeContainer):
+
+    unrestricted_objects = ('rstat',)  # not used (yet)
+
+    def getItems(self):
+        return self.values()
+
+    def updateGlobals(self, globs):
+        if HAS_R:
+            from cybertools.pyscript import rstat
+            context = globs['context']
+            request = globs['request']
+            globs['rstat'] = rstat.RStat(context, request)
+            globs['r'] = r
+            globs['rpy'] = rpy
+
     engine = create_engine('%s://%s:%s@%s:%s/%s' % (dbengine, dbuser, dbpassword,
                                                     dbhost, dbport,
                                                     dbname), **kwargs)
@@ -163,7 +352,7 @@ class ImportBase(object):
             prefix = self.type.namePrefix
         else:
             prefix = adapted(self.concepts[typeName]).namePrefix
-        if isinstance(identifier, str) or isinstance(identifier, unicode):
+        if isinstance(identifier, str):
             identifier = identifier.lower()
         return prefix + str(identifier)
 
diff --git a/cco/common/report.py b/cco/common/report.py
index e592e54..f72a19a 100755
--- a/cco/common/report.py
+++ b/cco/common/report.py
@@ -1,23 +1,6 @@
-#
-#  Copyright (c) 2019 Helmut Merz helmutm@cy55.de
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
+# cco.common.report
 
-"""
-Common classes and other definitions for reporting.
+""" Common classes and other definitions for reporting.
 """
 
 from datetime import datetime
@@ -118,7 +101,7 @@ class CurrencyField(BaseDecimalField):
     def getRawValue(self, row):
         value = row.getRawValue(self.name)
         if value:
-            if isinstance(value, basestring):
+            if isinstance(value, str):
                 value = parseNumber(value)
             if not isinstance(value, float):
                 value = float(value)
diff --git a/cco/common/util.py b/cco/common/util.py
index d5c39b4..4200ca3 100644
--- a/cco/common/util.py
+++ b/cco/common/util.py
@@ -114,7 +114,7 @@ def XLSListReader(f, sheet_index=0,
             col_value = []
             for col in range(sheet.ncols):
                 value = (sheet.cell(row, col).value)
-                value = unicode(value)  # str(int(value))
+                #value = unicode(value)  # str(int(value))
                 col_value.append(value)
             values.append(col_value)
     return values
@@ -137,7 +137,7 @@ sepaCharacters = ('a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
 
 
 def replaceNoneSepaCharacters(string, length=None):
-    if not isinstance(string, basestring):
+    if not isinstance(string, str):
         return string
     result = u''
     for s in string:
diff --git a/cco/processor/transformer.py b/cco/processor/transformer.py
index e8c2bd8..ead89f7 100644
--- a/cco/processor/transformer.py
+++ b/cco/processor/transformer.py
@@ -1,9 +1,6 @@
-#
 # cco.processor.transformer
-#
 
-"""
-Transform a data structure (represented by a dictionary )
+""" Transform a data structure (represented by a dictionary )
 """
 
 from datetime import date
@@ -72,14 +69,14 @@ def const(val):
 def int_inv(val):
     if val is None:
         return None
-    if isinstance(val, basestring) and val == '':
+    if isinstance(val, str) and val == '':
         return _invalid
     return int(val)
 
 def float_inv(val):
     if val is None:
         return None
-    if isinstance(val, basestring) and val == '':
+    if isinstance(val, str) and val == '':
         return _invalid
     return float(val)
 
@@ -88,6 +85,6 @@ def iso_date(val, context=None, format='%Y-%m-%d'):
         return None
     if isinstance(val, date):
         return val
-    if isinstance(val, basestring) and val == '':
+    if isinstance(val, str) and val == '':
         return _invalid
     return date(*(time.strptime(val[:10], format)[:3]))
diff --git a/cyberapps/commerce/order.py b/cyberapps/commerce/order.py
index d50de6d..efacea7 100644
--- a/cyberapps/commerce/order.py
+++ b/cyberapps/commerce/order.py
@@ -37,7 +37,7 @@ class OrderItem(BaseOrderItem):
     def getObject(self, ref):
         if isinstance(ref, int):
             return util.getObjectForUid(ref)
-        if isinstance(ref, basestring):
+        if isinstance(ref, str):
             if ref.isdigit:
                 return util.getObjectForUid(ref)
             if ':' in ref:
diff --git a/cyberapps/commerce/util.py b/cyberapps/commerce/util.py
index 165866b..68c7077 100644
--- a/cyberapps/commerce/util.py
+++ b/cyberapps/commerce/util.py
@@ -13,8 +13,8 @@ _ = MessageFactory('cyberapps.commerce')
 
 
 def sendEMail(subject, message, sender, recipients):
-    if isinstance(message, unicode):
-        message = message.encode('UTF-8')
+    #if isinstance(message, str):
+    #    message = message.encode('UTF-8')
     msg = MIMEText(message, 'plain', 'utf-8')
     msg['Subject'] = subject
     msg['From'] = sender