diff --git a/pmml-python/src/main/java/numpy/random/BitGenerator.java b/pmml-python/src/main/java/numpy/random/BitGenerator.java
index 25ddfca..24ba74e 100644
--- a/pmml-python/src/main/java/numpy/random/BitGenerator.java
+++ b/pmml-python/src/main/java/numpy/random/BitGenerator.java
@@ -31,7 +31,17 @@ public void __init__(Object[] args){
 		super.__setstate__(INIT_ATTRIBUTES, args);
 	}
 
+	@Override
+	public void __setstate__(Object[] args){
+		super.__setstate__(SETSTATE_ATTRIBUTES, args);
+	}
+
 	private static final String[] INIT_ATTRIBUTES = {
 		"seed"
 	};
+
+	private static final String[] SETSTATE_ATTRIBUTES = {
+		"_seed_seq",
+		"state"
+	};
 }
\ No newline at end of file
diff --git a/pmml-python/src/main/java/numpy/random/BitGeneratorUtil.java b/pmml-python/src/main/java/numpy/random/BitGeneratorUtil.java
index dca3b01..a7baf33 100644
--- a/pmml-python/src/main/java/numpy/random/BitGeneratorUtil.java
+++ b/pmml-python/src/main/java/numpy/random/BitGeneratorUtil.java
@@ -31,17 +31,32 @@ private BitGeneratorUtil(){
 	static
 	public BitGenerator createBitGenerator(Object[] args){
 
-		// Numpy 1.23.4
+		// NumPy 1.23.4 or NumPy 2.0.0+
 		if(args.length == 1){
-			String bitGeneratorName = (String)args[0];
 
-			// XXX
-			BitGenerator bitGenerator = new BitGenerator("numpy.random._" + bitGeneratorName.toLowerCase(), bitGeneratorName);
+			// NumPy 1.23.4
+			if(args[0] instanceof String){
+				String bitGeneratorName = (String)args[0];
 
-			return bitGenerator;
+				// XXX
+				BitGenerator bitGenerator = new BitGenerator("numpy.random._" + bitGeneratorName.toLowerCase(), bitGeneratorName);
+
+				return bitGenerator;
+			} else
+
+			// NumPy 2.0.0+
+			if(args[0] instanceof BitGenerator){
+				BitGenerator bitGenerator = (BitGenerator)args[0];
+
+				return bitGenerator;
+			} else
+
+			{
+				throw new PickleException(Arrays.deepToString(args));
+			}
 		} else
 
-		// Numpy 1.24.1+
+		// NumPy 1.24.1+
 		if(args.length == 2){
 			String bitGeneratorName = (String)args[0];
 			ClassDictConstructor bitGeneratorCtor = (ClassDictConstructor)args[1];
diff --git a/pmml-python/src/main/java/numpy/random/SeedSequence.java b/pmml-python/src/main/java/numpy/random/SeedSequence.java
new file mode 100644
index 0000000..feb3ae8
--- /dev/null
+++ b/pmml-python/src/main/java/numpy/random/SeedSequence.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2024 Villu Ruusmann
+ *
+ * This file is part of JPMML-Python
+ *
+ * JPMML-Python is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * JPMML-Python 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 Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with JPMML-Python.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package numpy.random;
+
+import org.jpmml.python.CythonObject;
+
+public class SeedSequence extends CythonObject {
+
+	public SeedSequence(String module, String name){
+		super(module, name);
+	}
+
+	@Override
+	public void __init__(Object[] args){
+		// Ignored
+	}
+
+	@Override
+	public void __setstate__(Object[] args){
+		// Ignored
+	}
+}
\ No newline at end of file
diff --git a/pmml-python/src/main/resources/META-INF/python2pmml.properties b/pmml-python/src/main/resources/META-INF/python2pmml.properties
index 2a851d5..578d1bb 100644
--- a/pmml-python/src/main/resources/META-INF/python2pmml.properties
+++ b/pmml-python/src/main/resources/META-INF/python2pmml.properties
@@ -11,11 +11,11 @@ functools.partial = functools.Partial
 joblib.numpy_pickle.NumpyArrayWrapper = joblib.NumpyArrayWrapper
 math.(acos|asin|atan|atan2|ceil|copysign|cos|cosh|degrees|exp|expm1|fabs|floor|hypot|isnan|log|log1p|log10|pow|radians|sin|sinh|sqrt|tan|tanh|trunc) = builtins.Function
 numpy.(|core.fromnumeric.)clip = numpy.core.Function
-numpy.(|core._multiarray_umath.)(absolute|arccos|arcsin|arctan|arctan2|ceil|clip|cos|cosh|degrees|rad2deg|exp|expm1|floor|fmax|fmin|hypot|log|log1p|log10|negative|power|radians|deg2rad|reciprocal|rint|sign|sin|sinh|sqrt|square|tan|tanh) = numpy.core.Function
+numpy.(|_core._multiarray_umath.|core._multiarray_umath.)(absolute|arccos|arcsin|arctan|arctan2|ceil|clip|cos|cosh|degrees|rad2deg|exp|expm1|floor|fmax|fmin|hypot|log|log1p|log10|negative|power|radians|deg2rad|reciprocal|rint|sign|sin|sinh|sqrt|square|tan|tanh) = numpy.core.Function
 numpy.(bool_|float_|float32|float64|int_|int8|int16|int32|int64|str_|uint8|uint16|uint32|uint64) = builtins.TypeConstructor
 numpy.core.(_multiarray_umath|multiarray)._reconstruct = numpy.core.NDArray
 numpy.core.(_multiarray_umath|multiarray).scalar = numpy.core.Scalar
-numpy.core.numeric._frombuffer = numpy.core.FromBufferConstructor
+numpy.(_core|core).numeric._frombuffer = numpy.core.FromBufferConstructor
 numpy.core._ufunc_reconstruct = numpy.core.UFunc
 numpy.dtype = numpy.DType
 numpy.ma.core._mareconstruct = numpy.core.MaskedArray
@@ -23,6 +23,7 @@ numpy.random.__RandomState_ctor = numpy.random.RandomState
 numpy.random._pickle.__bit_generator_ctor = numpy.random.BitGenerator
 numpy.random._pickle.__generator_ctor = numpy.random.Generator
 numpy.random._pickle.__randomstate_ctor = numpy.random.LegacyRandomState
+numpy.random.bit_generator.__pyx_unpickle_SeedSequence = numpy.random.SeedSequence
 pandas.core.arrays.boolean.BooleanArray = pandas.core.MaskedArray
 pandas.core.arrays.boolean.BooleanDtype = pandas.core.BooleanDtype
 pandas.core.arrays.categorical.Categorical = pandas.core.Categorical
diff --git a/pmml-python/src/test/java/org/jpmml/python/DumpTest.java b/pmml-python/src/test/java/org/jpmml/python/DumpTest.java
index e05baf2..70e2a4e 100644
--- a/pmml-python/src/test/java/org/jpmml/python/DumpTest.java
+++ b/pmml-python/src/test/java/org/jpmml/python/DumpTest.java
@@ -145,18 +145,22 @@ public void python39() throws Exception {
 		unpickleNumpyArrays("python-3.9_numpy-1.23.4");
 		unpickleNumpyArrays("python-3.9_numpy-1.24.1");
 		unpickleNumpyArrays("python-3.9_numpy-1.26.2");
+		unpickleNumpyArrays("python-3.9_numpy-2.0.0");
 
 		unpickleNumpyDtypes("python-3.9_numpy-1.22.3");
 		unpickleNumpyDtypes("python-3.9_numpy-1.23.4");
 		unpickleNumpyDtypes("python-3.9_numpy-1.24.1");
 		unpickleNumpyDtypes("python-3.9_numpy-1.26.2");
+		unpickleNumpyDtypes("python-3.9_numpy-2.0.0");
 
 		unpickleNumpyDatetimeDtypes("python-3.9_numpy-1.24.1");
 		unpickleNumpyDatetimeDtypes("python-3.9_numpy-1.26.2");
+		unpickleNumpyDatetimeDtypes("python-3.9_numpy-2.0.0");
 
 		unpickleNumpyRNGs("python-3.9_numpy-1.23.4");
 		unpickleNumpyRNGs("python-3.9_numpy-1.24.1");
 		unpickleNumpyRNGs("python-3.9_numpy-1.26.2");
+		unpickleNumpyRNGs("python-3.9_numpy-2.0.0");
 
 		unpicklePandasSeries("python-3.9_pandas-1.2.3");
 		unpicklePandasSeries("python-3.9_pandas-1.3.1");
@@ -227,17 +231,21 @@ public void python311() throws Exception {
 		unpickleNumpyArrays("python-3.11_numpy-1.23.4");
 		unpickleNumpyArrays("python-3.11_numpy-1.24.1");
 		unpickleNumpyArrays("python-3.11_numpy-1.26.2");
+		unpickleNumpyArrays("python-3.11_numpy-2.0.0");
 
 		unpickleNumpyDtypes("python-3.11_numpy-1.23.4");
 		unpickleNumpyDtypes("python-3.11_numpy-1.24.1");
 		unpickleNumpyDtypes("python-3.11_numpy-1.26.2");
+		unpickleNumpyDtypes("python-3.11_numpy-2.0.0");
 
 		unpickleNumpyDatetimeDtypes("python-3.11_numpy-1.24.1");
 		unpickleNumpyDatetimeDtypes("python-3.11_numpy-1.26.2");
+		unpickleNumpyDatetimeDtypes("python-3.11_numpy-2.0.0");
 
 		unpickleNumpyRNGs("python-3.11_numpy-1.23.4");
 		unpickleNumpyRNGs("python-3.11_numpy-1.24.1");
 		unpickleNumpyRNGs("python-3.11_numpy-1.26.2");
+		unpickleNumpyRNGs("python-3.11_numpy-2.0.0");
 
 		unpicklePandasSeries("python-3.11_pandas-1.5.1");
 		unpicklePandasSeries("python-3.11_pandas-1.5.2");
@@ -287,12 +295,16 @@ public void python312() throws Exception {
 		unpickleEnums("python-3.12");
 
 		unpickleNumpyArrays("python-3.12_numpy-1.26.2");
+		unpickleNumpyArrays("python-3.12_numpy-2.0.0");
 
 		unpickleNumpyDtypes("python-3.12_numpy-1.26.2");
+		unpickleNumpyDtypes("python-3.12_numpy-2.0.0");
 
 		unpickleNumpyDatetimeDtypes("python-3.12_numpy-1.26.2");
+		unpickleNumpyDatetimeDtypes("python-3.12_numpy-2.0.0");
 
 		unpickleNumpyRNGs("python-3.12_numpy-1.26.2");
+		unpickleNumpyRNGs("python-3.12_numpy-2.0.0");
 
 		unpicklePandasSeries("python-3.12_pandas-2.2.0");
 
diff --git a/pmml-python/src/test/java/org/jpmml/python/FunctionTest.java b/pmml-python/src/test/java/org/jpmml/python/FunctionTest.java
index 3d658d9..903dca6 100644
--- a/pmml-python/src/test/java/org/jpmml/python/FunctionTest.java
+++ b/pmml-python/src/test/java/org/jpmml/python/FunctionTest.java
@@ -56,6 +56,7 @@ public void python39() throws IOException {
 		unpickleNumpyFunctions("python-3.9_numpy-1.23.4");
 		unpickleNumpyFunctions("python-3.9_numpy-1.24.1");
 		unpickleNumpyFunctions("python-3.9_numpy-1.26.2");
+		unpickleNumpyFunctions("python-3.9_numpy-2.0.0");
 	}
 
 	@Test
@@ -65,6 +66,7 @@ public void python311() throws IOException {
 		unpickleNumpyFunctions("python-3.11_numpy-1.23.4");
 		unpickleNumpyFunctions("python-3.11_numpy-1.24.1");
 		unpickleNumpyFunctions("python-3.11_numpy-1.26.2");
+		unpickleNumpyFunctions("python-3.11_numpy-2.0.0");
 	}
 
 	@Test
@@ -72,6 +74,7 @@ public void python312() throws Exception {
 		unpickleMathFunctions("python-3.12_math");
 
 		unpickleNumpyFunctions("python-3.12_numpy-1.26.2");
+		unpickleNumpyFunctions("python-3.12_numpy-2.0.0");
 	}
 
 	static
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_bool.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_bool.pkl
new file mode 100644
index 0000000..a190903
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_bool.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_datetime_dtypes.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_datetime_dtypes.pkl
new file mode 100644
index 0000000..0a51be2
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_datetime_dtypes.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_dtypes.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_dtypes.pkl
new file mode 100644
index 0000000..ce04d14
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_dtypes.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_float32.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_float32.pkl
new file mode 100644
index 0000000..ec313f4
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_float32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_float64.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_float64.pkl
new file mode 100644
index 0000000..f6c379b
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_float64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int.pkl
new file mode 100644
index 0000000..cbf9192
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int16.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int16.pkl
new file mode 100644
index 0000000..921cb9b
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int16.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int32.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int32.pkl
new file mode 100644
index 0000000..b0dada3
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int64.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int64.pkl
new file mode 100644
index 0000000..cbf9192
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int8.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int8.pkl
new file mode 100644
index 0000000..10fbd6d
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_int8.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_rngs.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_rngs.pkl
new file mode 100644
index 0000000..2d4c691
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_rngs.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint16.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint16.pkl
new file mode 100644
index 0000000..c79b4db
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint16.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint32.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint32.pkl
new file mode 100644
index 0000000..8f6ec48
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint64.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint64.pkl
new file mode 100644
index 0000000..34f6ca3
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint8.pkl b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint8.pkl
new file mode 100644
index 0000000..b4db007
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.11_numpy-2.0.0_uint8.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_bool.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_bool.pkl
new file mode 100644
index 0000000..a190903
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_bool.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_datetime_dtypes.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_datetime_dtypes.pkl
new file mode 100644
index 0000000..0a51be2
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_datetime_dtypes.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_dtypes.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_dtypes.pkl
new file mode 100644
index 0000000..ce04d14
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_dtypes.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_float32.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_float32.pkl
new file mode 100644
index 0000000..ec313f4
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_float32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_float64.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_float64.pkl
new file mode 100644
index 0000000..f6c379b
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_float64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int.pkl
new file mode 100644
index 0000000..cbf9192
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int16.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int16.pkl
new file mode 100644
index 0000000..921cb9b
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int16.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int32.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int32.pkl
new file mode 100644
index 0000000..b0dada3
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int64.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int64.pkl
new file mode 100644
index 0000000..cbf9192
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int8.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int8.pkl
new file mode 100644
index 0000000..10fbd6d
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_int8.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_rngs.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_rngs.pkl
new file mode 100644
index 0000000..2d4c691
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_rngs.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint16.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint16.pkl
new file mode 100644
index 0000000..c79b4db
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint16.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint32.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint32.pkl
new file mode 100644
index 0000000..8f6ec48
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint64.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint64.pkl
new file mode 100644
index 0000000..34f6ca3
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint8.pkl b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint8.pkl
new file mode 100644
index 0000000..b4db007
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.12_numpy-2.0.0_uint8.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_bool.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_bool.pkl
new file mode 100644
index 0000000..a190903
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_bool.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_datetime_dtypes.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_datetime_dtypes.pkl
new file mode 100644
index 0000000..0a51be2
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_datetime_dtypes.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_dtypes.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_dtypes.pkl
new file mode 100644
index 0000000..ce04d14
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_dtypes.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_float32.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_float32.pkl
new file mode 100644
index 0000000..ec313f4
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_float32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_float64.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_float64.pkl
new file mode 100644
index 0000000..f6c379b
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_float64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int.pkl
new file mode 100644
index 0000000..cbf9192
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int16.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int16.pkl
new file mode 100644
index 0000000..921cb9b
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int16.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int32.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int32.pkl
new file mode 100644
index 0000000..b0dada3
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int64.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int64.pkl
new file mode 100644
index 0000000..cbf9192
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int8.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int8.pkl
new file mode 100644
index 0000000..10fbd6d
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_int8.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_rngs.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_rngs.pkl
new file mode 100644
index 0000000..2d4c691
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_rngs.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint16.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint16.pkl
new file mode 100644
index 0000000..c79b4db
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint16.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint32.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint32.pkl
new file mode 100644
index 0000000..8f6ec48
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint32.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint64.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint64.pkl
new file mode 100644
index 0000000..34f6ca3
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint64.pkl differ
diff --git a/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint8.pkl b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint8.pkl
new file mode 100644
index 0000000..b4db007
Binary files /dev/null and b/pmml-python/src/test/resources/dump/python-3.9_numpy-2.0.0_uint8.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_absolute.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_absolute.pkl
new file mode 100644
index 0000000..7fb8efd
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_absolute.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arccos.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arccos.pkl
new file mode 100644
index 0000000..ee38af8
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arccos.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arcsin.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arcsin.pkl
new file mode 100644
index 0000000..7e2a22f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arcsin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arctan.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arctan.pkl
new file mode 100644
index 0000000..7aed743
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arctan.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arctan2.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arctan2.pkl
new file mode 100644
index 0000000..f34e838
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_arctan2.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_ceil.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_ceil.pkl
new file mode 100644
index 0000000..57159c2
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_ceil.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_clip.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_clip.pkl
new file mode 100644
index 0000000..3a96b2f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_clip.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_cos.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_cos.pkl
new file mode 100644
index 0000000..e87ad50
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_cos.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_cosh.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_cosh.pkl
new file mode 100644
index 0000000..8deee4f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_cosh.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_deg2rad.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_deg2rad.pkl
new file mode 100644
index 0000000..d95be9c
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_deg2rad.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_degrees.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_degrees.pkl
new file mode 100644
index 0000000..c85ada6
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_degrees.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_exp.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_exp.pkl
new file mode 100644
index 0000000..3c5ef4f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_exp.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_expm1.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_expm1.pkl
new file mode 100644
index 0000000..063db6a
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_expm1.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_floor.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_floor.pkl
new file mode 100644
index 0000000..24f501f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_floor.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_fmax.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_fmax.pkl
new file mode 100644
index 0000000..fed7b93
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_fmax.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_fmin.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_fmin.pkl
new file mode 100644
index 0000000..a6d6bc7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_fmin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_hypot.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_hypot.pkl
new file mode 100644
index 0000000..fd912e7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_hypot.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log.pkl
new file mode 100644
index 0000000..a298624
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log10.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log10.pkl
new file mode 100644
index 0000000..0880dc9
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log10.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log1p.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log1p.pkl
new file mode 100644
index 0000000..80231be
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_log1p.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_negative.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_negative.pkl
new file mode 100644
index 0000000..0fe51b7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_negative.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_power.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_power.pkl
new file mode 100644
index 0000000..60b7997
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_power.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_rad2deg.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_rad2deg.pkl
new file mode 100644
index 0000000..b66aebe
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_rad2deg.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_radians.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_radians.pkl
new file mode 100644
index 0000000..fea283f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_radians.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_reciprocal.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_reciprocal.pkl
new file mode 100644
index 0000000..a4e51c5
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_reciprocal.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_rint.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_rint.pkl
new file mode 100644
index 0000000..125e788
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_rint.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sign.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sign.pkl
new file mode 100644
index 0000000..82a9559
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sign.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sin.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sin.pkl
new file mode 100644
index 0000000..5a69eaa
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sinh.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sinh.pkl
new file mode 100644
index 0000000..8210983
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sinh.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sqrt.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sqrt.pkl
new file mode 100644
index 0000000..47a2d5b
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_sqrt.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_square.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_square.pkl
new file mode 100644
index 0000000..21161bb
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_square.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_tan.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_tan.pkl
new file mode 100644
index 0000000..ae74ce1
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_tan.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_tanh.pkl b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_tanh.pkl
new file mode 100644
index 0000000..0c95387
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.11_numpy-2.0.0_tanh.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_absolute.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_absolute.pkl
new file mode 100644
index 0000000..7fb8efd
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_absolute.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arccos.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arccos.pkl
new file mode 100644
index 0000000..ee38af8
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arccos.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arcsin.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arcsin.pkl
new file mode 100644
index 0000000..7e2a22f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arcsin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arctan.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arctan.pkl
new file mode 100644
index 0000000..7aed743
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arctan.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arctan2.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arctan2.pkl
new file mode 100644
index 0000000..f34e838
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_arctan2.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_ceil.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_ceil.pkl
new file mode 100644
index 0000000..57159c2
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_ceil.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_clip.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_clip.pkl
new file mode 100644
index 0000000..3a96b2f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_clip.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_cos.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_cos.pkl
new file mode 100644
index 0000000..e87ad50
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_cos.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_cosh.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_cosh.pkl
new file mode 100644
index 0000000..8deee4f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_cosh.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_deg2rad.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_deg2rad.pkl
new file mode 100644
index 0000000..d95be9c
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_deg2rad.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_degrees.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_degrees.pkl
new file mode 100644
index 0000000..c85ada6
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_degrees.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_exp.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_exp.pkl
new file mode 100644
index 0000000..3c5ef4f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_exp.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_expm1.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_expm1.pkl
new file mode 100644
index 0000000..063db6a
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_expm1.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_floor.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_floor.pkl
new file mode 100644
index 0000000..24f501f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_floor.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_fmax.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_fmax.pkl
new file mode 100644
index 0000000..fed7b93
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_fmax.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_fmin.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_fmin.pkl
new file mode 100644
index 0000000..a6d6bc7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_fmin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_hypot.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_hypot.pkl
new file mode 100644
index 0000000..fd912e7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_hypot.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log.pkl
new file mode 100644
index 0000000..a298624
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log10.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log10.pkl
new file mode 100644
index 0000000..0880dc9
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log10.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log1p.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log1p.pkl
new file mode 100644
index 0000000..80231be
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_log1p.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_negative.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_negative.pkl
new file mode 100644
index 0000000..0fe51b7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_negative.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_power.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_power.pkl
new file mode 100644
index 0000000..60b7997
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_power.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_rad2deg.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_rad2deg.pkl
new file mode 100644
index 0000000..b66aebe
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_rad2deg.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_radians.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_radians.pkl
new file mode 100644
index 0000000..fea283f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_radians.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_reciprocal.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_reciprocal.pkl
new file mode 100644
index 0000000..a4e51c5
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_reciprocal.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_rint.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_rint.pkl
new file mode 100644
index 0000000..125e788
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_rint.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sign.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sign.pkl
new file mode 100644
index 0000000..82a9559
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sign.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sin.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sin.pkl
new file mode 100644
index 0000000..5a69eaa
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sinh.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sinh.pkl
new file mode 100644
index 0000000..8210983
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sinh.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sqrt.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sqrt.pkl
new file mode 100644
index 0000000..47a2d5b
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_sqrt.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_square.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_square.pkl
new file mode 100644
index 0000000..21161bb
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_square.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_tan.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_tan.pkl
new file mode 100644
index 0000000..ae74ce1
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_tan.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_tanh.pkl b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_tanh.pkl
new file mode 100644
index 0000000..0c95387
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.12_numpy-2.0.0_tanh.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_absolute.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_absolute.pkl
new file mode 100644
index 0000000..7fb8efd
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_absolute.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arccos.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arccos.pkl
new file mode 100644
index 0000000..ee38af8
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arccos.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arcsin.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arcsin.pkl
new file mode 100644
index 0000000..7e2a22f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arcsin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arctan.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arctan.pkl
new file mode 100644
index 0000000..7aed743
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arctan.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arctan2.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arctan2.pkl
new file mode 100644
index 0000000..f34e838
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_arctan2.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_ceil.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_ceil.pkl
new file mode 100644
index 0000000..57159c2
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_ceil.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_clip.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_clip.pkl
new file mode 100644
index 0000000..3a96b2f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_clip.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_cos.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_cos.pkl
new file mode 100644
index 0000000..e87ad50
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_cos.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_cosh.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_cosh.pkl
new file mode 100644
index 0000000..8deee4f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_cosh.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_deg2rad.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_deg2rad.pkl
new file mode 100644
index 0000000..d95be9c
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_deg2rad.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_degrees.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_degrees.pkl
new file mode 100644
index 0000000..c85ada6
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_degrees.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_exp.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_exp.pkl
new file mode 100644
index 0000000..3c5ef4f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_exp.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_expm1.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_expm1.pkl
new file mode 100644
index 0000000..063db6a
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_expm1.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_floor.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_floor.pkl
new file mode 100644
index 0000000..24f501f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_floor.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_fmax.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_fmax.pkl
new file mode 100644
index 0000000..fed7b93
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_fmax.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_fmin.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_fmin.pkl
new file mode 100644
index 0000000..a6d6bc7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_fmin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_hypot.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_hypot.pkl
new file mode 100644
index 0000000..fd912e7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_hypot.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log.pkl
new file mode 100644
index 0000000..a298624
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log10.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log10.pkl
new file mode 100644
index 0000000..0880dc9
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log10.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log1p.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log1p.pkl
new file mode 100644
index 0000000..80231be
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_log1p.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_negative.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_negative.pkl
new file mode 100644
index 0000000..0fe51b7
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_negative.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_power.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_power.pkl
new file mode 100644
index 0000000..60b7997
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_power.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_rad2deg.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_rad2deg.pkl
new file mode 100644
index 0000000..b66aebe
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_rad2deg.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_radians.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_radians.pkl
new file mode 100644
index 0000000..fea283f
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_radians.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_reciprocal.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_reciprocal.pkl
new file mode 100644
index 0000000..a4e51c5
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_reciprocal.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_rint.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_rint.pkl
new file mode 100644
index 0000000..125e788
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_rint.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sign.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sign.pkl
new file mode 100644
index 0000000..82a9559
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sign.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sin.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sin.pkl
new file mode 100644
index 0000000..5a69eaa
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sin.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sinh.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sinh.pkl
new file mode 100644
index 0000000..8210983
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sinh.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sqrt.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sqrt.pkl
new file mode 100644
index 0000000..47a2d5b
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_sqrt.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_square.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_square.pkl
new file mode 100644
index 0000000..21161bb
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_square.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_tan.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_tan.pkl
new file mode 100644
index 0000000..ae74ce1
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_tan.pkl differ
diff --git a/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_tanh.pkl b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_tanh.pkl
new file mode 100644
index 0000000..0c95387
Binary files /dev/null and b/pmml-python/src/test/resources/ufunc/python-3.9_numpy-2.0.0_tanh.pkl differ