From c695a99d2a9902a693a44897737b7f99e7016f27 Mon Sep 17 00:00:00 2001
From: Octavian Patrascoiu <opatrascoiu@yahoo.com>
Date: Wed, 19 Jun 2024 12:18:18 +0100
Subject: [PATCH 1/3] [#675] JavaTime dialects: Move native type methods from
 dialect to NativeTypeFactory.

---
 .../gs/dmn/dialect/DMNDialectDefinition.java  | 13 ---------
 ...ubleMixedJavaTimeDMNDialectDefinition.java | 25 -----------------
 ...imeKotlinStandardDMNDialectDefinition.java | 25 -----------------
 .../dialect/JavaTimeDMNDialectDefinition.java | 26 ------------------
 ...imeKotlinStandardDMNDialectDefinition.java | 27 -------------------
 ...imePythonStandardDMNDialectDefinition.java | 25 -----------------
 .../KotlinStandardDMNDialectDefinition.java   | 25 -----------------
 .../MixedJavaTimeDMNDialectDefinition.java    | 25 -----------------
 ...imeKotlinStandardDMNDialectDefinition.java | 25 -----------------
 .../dialect/StandardDMNDialectDefinition.java | 25 -----------------
 .../synthesis/type/NativeTypeFactory.java     | 25 +++++++++++++++++
 .../basic/BasicDMNToJavaTransformer.java      | 10 +++----
 ...imeKotlinSignavioDMNDialectDefinition.java | 25 -----------------
 ...dJavaTimeSignavioDMNDialectDefinition.java | 25 -----------------
 .../JavaTimeSignavioDMNDialectDefinition.java | 25 -----------------
 .../KotlinSignavioDMNDialectDefinition.java   | 25 -----------------
 ...imeKotlinSignavioDMNDialectDefinition.java | 25 -----------------
 ...dJavaTimeSignavioDMNDialectDefinition.java | 25 -----------------
 .../dialect/SignavioDMNDialectDefinition.java | 25 -----------------
 19 files changed, 30 insertions(+), 421 deletions(-)

diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/DMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/DMNDialectDefinition.java
index 0c2a6f4fc..ac3450f00 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/DMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/DMNDialectDefinition.java
@@ -64,17 +64,4 @@ public interface DMNDialectDefinition<NUMBER, DATE, TIME, DATE_TIME, DURATION, T
     FEELLib<NUMBER, DATE, TIME, DATE_TIME, DURATION> createFEELLib();
 
     String getDecisionBaseClass();
-
-    //
-    // Types
-    //
-    String getNativeNumberType();
-
-    String getNativeDateType();
-
-    String getNativeTimeType();
-
-    String getNativeDateAndTimeType();
-
-    String getNativeDurationType();
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/DoubleMixedJavaTimeDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/DoubleMixedJavaTimeDMNDialectDefinition.java
index 2726e17c9..67132aecf 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/DoubleMixedJavaTimeDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/DoubleMixedJavaTimeDMNDialectDefinition.java
@@ -72,29 +72,4 @@ public FEELLib<Double, LocalDate, OffsetTime, ZonedDateTime, Duration> createFEE
     public String getDecisionBaseClass() {
         return DoubleMixedJavaTimeDMNBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return Double.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return OffsetTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return ZonedDateTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/DoubleMixedJavaTimeKotlinStandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/DoubleMixedJavaTimeKotlinStandardDMNDialectDefinition.java
index 8d2c9e451..d4f3ba893 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/DoubleMixedJavaTimeKotlinStandardDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/DoubleMixedJavaTimeKotlinStandardDMNDialectDefinition.java
@@ -73,29 +73,4 @@ public FEELLib<Double, LocalDate, OffsetTime, ZonedDateTime, Duration> createFEE
     public String getDecisionBaseClass() {
         return DoubleMixedJavaTimeDMNBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return Double.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return OffsetTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return ZonedDateTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinition.java
index d8c8eb032..b04d9d3e6 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinition.java
@@ -33,7 +33,6 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.temporal.Temporal;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
@@ -69,29 +68,4 @@ public FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, Tempor
     public String getDecisionBaseClass() {
         return JavaTimeDMNBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return  BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return TemporalAccessor.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return TemporalAccessor.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return TemporalAmount.class.getName();
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinition.java
index 39a90fa0e..7a57e4de8 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinition.java
@@ -34,8 +34,6 @@
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.OffsetTime;
-import java.time.ZonedDateTime;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
@@ -71,29 +69,4 @@ public FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, Tempor
     public String getDecisionBaseClass() {
         return JavaTimeDMNBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return TemporalAccessor.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return TemporalAccessor.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return TemporalAmount.class.getName();
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimePythonStandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimePythonStandardDMNDialectDefinition.java
index baca9d592..38d90384b 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimePythonStandardDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimePythonStandardDMNDialectDefinition.java
@@ -74,29 +74,4 @@ protected String qualifiedName(Class<?> cls) {
         String qName = String.format("%s.%s", cls.getName(), cls.getSimpleName());
         return qName.replace("com.gs.dmn", "jdmn");
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return "decimal.Decimal";
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return "datetime.date";
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return "datetime.time";
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return "datetime.datetime";
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return "isodate.Duration";
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/KotlinStandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/KotlinStandardDMNDialectDefinition.java
index 9e69db23d..9d0f54f63 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/KotlinStandardDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/KotlinStandardDMNDialectDefinition.java
@@ -72,29 +72,4 @@ public FEELLib<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregor
     public String getDecisionBaseClass() {
         return DefaultDMNBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/MixedJavaTimeDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/MixedJavaTimeDMNDialectDefinition.java
index ab01e6d0d..6383b03fa 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/MixedJavaTimeDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/MixedJavaTimeDMNDialectDefinition.java
@@ -73,29 +73,4 @@ public FEELLib<BigDecimal, LocalDate, OffsetTime, ZonedDateTime, Duration> creat
     public String getDecisionBaseClass() {
         return MixedJavaTimeDMNBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return  BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return OffsetTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return ZonedDateTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/MixedJavaTimeKotlinStandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/MixedJavaTimeKotlinStandardDMNDialectDefinition.java
index df325212f..471977290 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/MixedJavaTimeKotlinStandardDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/MixedJavaTimeKotlinStandardDMNDialectDefinition.java
@@ -74,29 +74,4 @@ public FEELLib<BigDecimal, LocalDate, OffsetTime, ZonedDateTime, Duration> creat
     public String getDecisionBaseClass() {
         return MixedJavaTimeDMNBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return OffsetTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return ZonedDateTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/StandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/StandardDMNDialectDefinition.java
index 78bf79818..8e080d8ef 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/StandardDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/StandardDMNDialectDefinition.java
@@ -71,29 +71,4 @@ public FEELLib<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregor
     public String getDecisionBaseClass() {
         return DefaultDMNBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/NativeTypeFactory.java b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/NativeTypeFactory.java
index 73cb7a3b6..660bc0be4 100644
--- a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/NativeTypeFactory.java
+++ b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/NativeTypeFactory.java
@@ -12,6 +12,8 @@
  */
 package com.gs.dmn.feel.synthesis.type;
 
+import com.gs.dmn.feel.analysis.semantics.type.*;
+
 public interface NativeTypeFactory {
     String toNativeType(String feelType);
 
@@ -22,4 +24,27 @@ public interface NativeTypeFactory {
     String constructorOfGenericType(String typeName, String... typeParameters);
 
     String javaClass(String type);
+
+    //
+    // Types
+    //
+    default String getNativeNumberType() {
+        return toNativeType(NumberType.NUMBER.getName());
+    }
+
+    default String getNativeDateType() {
+        return toNativeType(DateType.DATE.getName());
+    }
+
+    default String getNativeTimeType() {
+        return toNativeType(TimeType.TIME.getName());
+    }
+
+    default String getNativeDateAndTimeType() {
+        return toNativeType(DateTimeType.DATE_AND_TIME.getName());
+    }
+
+    default String getNativeDurationType() {
+        return toNativeType(DurationType.DAYS_AND_TIME_DURATION.getName());
+    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java b/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java
index a081b8163..77848e06e 100644
--- a/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java
+++ b/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java
@@ -2277,27 +2277,27 @@ public boolean isGenerateExtra() {
 
     @Override
     public String getNativeNumberType() {
-        return this.getDialect().getNativeNumberType();
+        return this.nativeTypeFactory.getNativeNumberType();
     }
 
     @Override
     public String getNativeDateType() {
-        return this.getDialect().getNativeDateType();
+        return this.nativeTypeFactory.getNativeDateType();
     }
 
     @Override
     public String getNativeTimeType() {
-        return this.getDialect().getNativeTimeType();
+        return this.nativeTypeFactory.getNativeTimeType();
     }
 
     @Override
     public String getNativeDateAndTimeType() {
-        return this.getDialect().getNativeDateAndTimeType();
+        return this.nativeTypeFactory.getNativeDateAndTimeType();
     }
 
     @Override
     public String getNativeDurationType() {
-        return this.getDialect().getNativeDurationType();
+        return this.nativeTypeFactory.getNativeDurationType();
     }
 
     @Override
diff --git a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/DoubleMixedJavaTimeKotlinSignavioDMNDialectDefinition.java b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/DoubleMixedJavaTimeKotlinSignavioDMNDialectDefinition.java
index 64b2f5b46..7bd08f51a 100644
--- a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/DoubleMixedJavaTimeKotlinSignavioDMNDialectDefinition.java
+++ b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/DoubleMixedJavaTimeKotlinSignavioDMNDialectDefinition.java
@@ -73,29 +73,4 @@ public FEELLib<Double, LocalDate, OffsetTime, ZonedDateTime, Duration> createFEE
     public String getDecisionBaseClass() {
         return DoubleMixedJavaTimeSignavioBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return Double.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return OffsetTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return ZonedDateTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/DoubleMixedJavaTimeSignavioDMNDialectDefinition.java b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/DoubleMixedJavaTimeSignavioDMNDialectDefinition.java
index cc5133a94..19606b59a 100644
--- a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/DoubleMixedJavaTimeSignavioDMNDialectDefinition.java
+++ b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/DoubleMixedJavaTimeSignavioDMNDialectDefinition.java
@@ -73,29 +73,4 @@ public FEELLib<Double, LocalDate, OffsetTime, ZonedDateTime, Duration> createFEE
     public String getDecisionBaseClass() {
         return DoubleMixedJavaTimeSignavioBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return Double.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return OffsetTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return ZonedDateTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/JavaTimeSignavioDMNDialectDefinition.java b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/JavaTimeSignavioDMNDialectDefinition.java
index af1ac183e..1fc251151 100644
--- a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/JavaTimeSignavioDMNDialectDefinition.java
+++ b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/JavaTimeSignavioDMNDialectDefinition.java
@@ -69,29 +69,4 @@ public FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, Tempor
     public String getDecisionBaseClass() {
         return JavaTimeSignavioBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return  BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return TemporalAccessor.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return TemporalAccessor.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return TemporalAmount.class.getName();
-    }
 }
diff --git a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/KotlinSignavioDMNDialectDefinition.java b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/KotlinSignavioDMNDialectDefinition.java
index fc2515b3f..17c00835a 100644
--- a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/KotlinSignavioDMNDialectDefinition.java
+++ b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/KotlinSignavioDMNDialectDefinition.java
@@ -72,29 +72,4 @@ public FEELLib<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregor
     public String getDecisionBaseClass() {
         return DefaultSignavioBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/MixedJavaTimeKotlinSignavioDMNDialectDefinition.java b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/MixedJavaTimeKotlinSignavioDMNDialectDefinition.java
index 08097cfd4..99ef2d506 100644
--- a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/MixedJavaTimeKotlinSignavioDMNDialectDefinition.java
+++ b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/MixedJavaTimeKotlinSignavioDMNDialectDefinition.java
@@ -70,29 +70,4 @@ public FEELLib<BigDecimal, LocalDate, OffsetTime, ZonedDateTime, Duration> creat
     public String getDecisionBaseClass() {
         return MixedJavaTimeSignavioBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return OffsetTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return ZonedDateTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/MixedJavaTimeSignavioDMNDialectDefinition.java b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/MixedJavaTimeSignavioDMNDialectDefinition.java
index ccd3af93a..50fafa8c1 100644
--- a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/MixedJavaTimeSignavioDMNDialectDefinition.java
+++ b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/MixedJavaTimeSignavioDMNDialectDefinition.java
@@ -74,29 +74,4 @@ public FEELLib<BigDecimal, LocalDate, OffsetTime, ZonedDateTime, Duration> creat
     public String getDecisionBaseClass() {
         return MixedJavaTimeSignavioBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return  BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return LocalDate.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return OffsetTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return ZonedDateTime.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }
diff --git a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/SignavioDMNDialectDefinition.java b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/SignavioDMNDialectDefinition.java
index 661f7f319..099d19f50 100644
--- a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/SignavioDMNDialectDefinition.java
+++ b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/SignavioDMNDialectDefinition.java
@@ -72,29 +72,4 @@ public FEELLib<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregor
     public String getDecisionBaseClass() {
         return DefaultSignavioBaseDecision.class.getName();
     }
-
-    @Override
-    public String getNativeNumberType() {
-        return BigDecimal.class.getName();
-    }
-
-    @Override
-    public String getNativeDateType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeTimeType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeDateAndTimeType() {
-        return XMLGregorianCalendar.class.getName();
-    }
-
-    @Override
-    public String getNativeDurationType() {
-        return Duration.class.getName();
-    }
 }

From d88b42fe28759f70edf7fea6aa372d963a02464f Mon Sep 17 00:00:00 2001
From: Octavian Patrascoiu <opatrascoiu@yahoo.com>
Date: Wed, 19 Jun 2024 13:50:46 +0100
Subject: [PATCH 2/3] [#675] JavaTime dialects: Change transformation tests to
 use JavaTime dialects.

---
 .../AbstractTckDMNToJavaTransformerTest.java  | 10 +++--
 ...AbstractTckDMNToKotlinTransformerTest.java | 10 +++--
 .../CL3DMNToLambdaTransformerTest.java        |  5 ++-
 .../java/dmn/EvaluatingB1SayHello.java        |  2 +-
 .../java/dmn/EvaluatingB2SayHello.java        |  2 +-
 .../expected/java/dmn/GreetThePerson.java     |  2 +-
 .../java/dmn/ModelCDecisionBasedOnBs.java     |  2 +-
 .../dmn/model_b1/EvaluatingB1SayHello.java    |  2 +-
 .../java/dmn/model_b1/GreetThePerson.java     |  2 +-
 .../dmn/model_b2/EvaluatingB2SayHello.java    |  2 +-
 .../dmn/model_c/ModelCDecisionBasedOnBs.java  |  2 +-
 .../java/dmn/model_b1/EvaluatingSayHello.java |  2 +-
 .../java/dmn/model_b1/GreetThePerson.java     |  2 +-
 .../java/dmn/model_b2/EvaluatingSayHello.java |  2 +-
 .../dmn/model_c/ModelCDecisionBasedOnBs.java  |  2 +-
 .../java/dmn/decisiontables/DateCompare1.java | 10 ++---
 .../java/dmn/decisiontables/DateCompare2.java | 12 +++---
 .../java/dmn/decisiontables/PriceGt10.java    |  2 +-
 .../java/dmn/decisiontables/PriceInRange.java |  2 +-
 .../java/dmn/decisiontables/DateCompare1.java | 10 ++---
 .../java/dmn/decisiontables/DateCompare2.java | 12 +++---
 .../java/dmn/decisiontables/PriceGt10.java    |  2 +-
 .../java/dmn/decisiontables/PriceInRange.java |  2 +-
 .../java/dmn/model_a/GreetThePerson.java      |  2 +-
 .../java/dmn/model_b/EvaluatingSayHello.java  |  2 +-
 .../dmn/model_b2/EvaluatingB2SayHello.java    |  2 +-
 .../ModelCDecisionBasedOnBs.java              |  2 +-
 .../expected/java/dmn/model_c/C.java          |  2 +-
 .../expected/java/dmn/model_c/C.java          |  2 +-
 .../translator/expected/java/dmn/C.java       |  2 +-
 .../expected/java/dmn/model_a/Bkm.java        |  2 +-
 .../expected/java/dmn/model_b/Bkm.java        |  2 +-
 .../expected/java/dmn/model_c/C.java          |  2 +-
 .../expected/java/dmn/AgeClassification.java  |  2 +-
 .../java/dmn/CalculateDiscountedPrice.java    |  2 +-
 .../expected/java/dmn/PriceGt10.java          |  2 +-
 .../proto3/java/dmn/Adjudication.java         |  2 +-
 .../java/dmn/AffordabilityCalculation.java    |  2 +-
 .../proto3/java/dmn/ApplicationRiskScore.java |  2 +-
 .../java/dmn/ApplicationRiskScoreModel.java   |  2 +-
 .../proto3/java/dmn/BureauCallType.java       |  2 +-
 .../proto3/java/dmn/BureauCallTypeTable.java  |  2 +-
 .../dmn/CreditContingencyFactorTable.java     |  2 +-
 .../expected/proto3/java/dmn/Eligibility.java |  2 +-
 .../proto3/java/dmn/EligibilityRules.java     |  2 +-
 .../java/dmn/InstallmentCalculation.java      |  2 +-
 .../java/dmn/PostBureauAffordability.java     |  2 +-
 .../java/dmn/PostBureauRiskCategory.java      |  2 +-
 .../java/dmn/PostBureauRiskCategoryTable.java |  2 +-
 .../java/dmn/PreBureauAffordability.java      |  2 +-
 .../java/dmn/PreBureauRiskCategory.java       |  2 +-
 .../java/dmn/PreBureauRiskCategoryTable.java  |  2 +-
 .../java/dmn/RequiredMonthlyInstallment.java  |  2 +-
 .../expected/proto3/java/dmn/Routing.java     |  2 +-
 .../proto3/java/dmn/RoutingRules.java         |  2 +-
 .../expected/proto3/java/dmn/Strategy.java    |  2 +-
 .../proto3/kotlin/dmn/Adjudication.kt         |  2 +-
 .../kotlin/dmn/AffordabilityCalculation.kt    |  2 +-
 .../proto3/kotlin/dmn/ApplicationRiskScore.kt |  2 +-
 .../kotlin/dmn/ApplicationRiskScoreModel.kt   |  2 +-
 .../proto3/kotlin/dmn/BureauCallType.kt       |  2 +-
 .../proto3/kotlin/dmn/BureauCallTypeTable.kt  |  2 +-
 .../dmn/CreditContingencyFactorTable.kt       |  2 +-
 .../expected/proto3/kotlin/dmn/Eligibility.kt |  2 +-
 .../proto3/kotlin/dmn/EligibilityRules.kt     |  2 +-
 .../kotlin/dmn/InstallmentCalculation.kt      |  2 +-
 .../kotlin/dmn/PostBureauAffordability.kt     |  2 +-
 .../kotlin/dmn/PostBureauRiskCategory.kt      |  2 +-
 .../kotlin/dmn/PostBureauRiskCategoryTable.kt |  2 +-
 .../kotlin/dmn/PreBureauAffordability.kt      |  2 +-
 .../kotlin/dmn/PreBureauRiskCategory.kt       |  2 +-
 .../kotlin/dmn/PreBureauRiskCategoryTable.kt  |  2 +-
 .../kotlin/dmn/RequiredMonthlyInstallment.kt  |  2 +-
 .../expected/proto3/kotlin/dmn/Routing.kt     |  2 +-
 .../proto3/kotlin/dmn/RoutingRules.kt         |  2 +-
 .../expected/proto3/kotlin/dmn/Strategy.kt    |  2 +-
 .../proto3/java/dmn/CompositeDateTime.java    |  2 +-
 .../expected/proto3/java/dmn/Date.java        | 26 ++++++------
 .../expected/proto3/java/dmn/DateTime.java    | 26 ++++++------
 .../expected/proto3/java/dmn/Time.java        | 26 ++++++------
 .../java/dmn/type/CompositeDateTime.java      | 40 +++++++++----------
 .../java/dmn/type/CompositeDateTimeImpl.java  | 32 +++++++--------
 .../proto3/kotlin/dmn/CompositeDateTime.kt    |  2 +-
 .../expected/proto3/kotlin/dmn/Date.kt        | 22 +++++-----
 .../expected/proto3/kotlin/dmn/DateTime.kt    | 22 +++++-----
 .../expected/proto3/kotlin/dmn/Time.kt        | 22 +++++-----
 .../kotlin/dmn/type/CompositeDateTime.kt      | 40 +++++++++----------
 .../kotlin/dmn/type/CompositeDateTimeImpl.kt  | 12 +++---
 .../expected/java/dmn/ApprovalStatus.java     |  2 +-
 .../expected/kotlin/dmn/ApprovalStatus.kt     |  2 +-
 .../expected/java/dmn/ApprovalStatus.java     |  2 +-
 .../expected/kotlin/dmn/ApprovalStatus.kt     |  2 +-
 .../expected/java/dmn/ApprovalStatus.java     |  2 +-
 .../expected/kotlin/dmn/ApprovalStatus.kt     |  2 +-
 .../expected/java/dmn/ApprovalStatus.java     |  2 +-
 .../expected/kotlin/dmn/ApprovalStatus.kt     |  2 +-
 .../translator/expected/java/dmn/Payment.java |  2 +-
 .../translator/expected/kotlin/dmn/Payment.kt |  2 +-
 .../expected/java/dmn/MonthlyPayment.java     |  2 +-
 .../translator/expected/java/dmn/PMT.java     |  2 +-
 .../expected/kotlin/dmn/MonthlyPayment.kt     |  2 +-
 .../translator/expected/kotlin/dmn/PMT.kt     |  2 +-
 .../expected/java/dmn/Approval.java           |  2 +-
 .../expected/kotlin/dmn/Approval.kt           |  2 +-
 .../expected/java/dmn/Adjudication.java       |  2 +-
 .../java/dmn/AffordabilityCalculation.java    |  2 +-
 .../java/dmn/ApplicationRiskScore.java        |  2 +-
 .../java/dmn/ApplicationRiskScoreModel.java   |  2 +-
 .../expected/java/dmn/BureauCallType.java     |  2 +-
 .../java/dmn/BureauCallTypeTable.java         |  2 +-
 .../dmn/CreditContingencyFactorTable.java     |  2 +-
 .../expected/java/dmn/Eligibility.java        |  2 +-
 .../expected/java/dmn/EligibilityRules.java   |  2 +-
 .../java/dmn/InstallmentCalculation.java      |  2 +-
 .../java/dmn/PostBureauAffordability.java     |  2 +-
 .../java/dmn/PostBureauRiskCategory.java      |  2 +-
 .../java/dmn/PostBureauRiskCategoryTable.java |  2 +-
 .../java/dmn/PreBureauAffordability.java      |  2 +-
 .../java/dmn/PreBureauRiskCategory.java       |  2 +-
 .../java/dmn/PreBureauRiskCategoryTable.java  |  2 +-
 .../java/dmn/RequiredMonthlyInstallment.java  |  2 +-
 .../translator/expected/java/dmn/Routing.java |  2 +-
 .../expected/java/dmn/RoutingRules.java       |  2 +-
 .../expected/java/dmn/Strategy.java           |  2 +-
 .../expected/kotlin/dmn/Adjudication.kt       |  2 +-
 .../kotlin/dmn/AffordabilityCalculation.kt    |  2 +-
 .../kotlin/dmn/ApplicationRiskScore.kt        |  2 +-
 .../kotlin/dmn/ApplicationRiskScoreModel.kt   |  2 +-
 .../expected/kotlin/dmn/BureauCallType.kt     |  2 +-
 .../kotlin/dmn/BureauCallTypeTable.kt         |  2 +-
 .../dmn/CreditContingencyFactorTable.kt       |  2 +-
 .../expected/kotlin/dmn/Eligibility.kt        |  2 +-
 .../expected/kotlin/dmn/EligibilityRules.kt   |  2 +-
 .../kotlin/dmn/InstallmentCalculation.kt      |  2 +-
 .../kotlin/dmn/PostBureauAffordability.kt     |  2 +-
 .../kotlin/dmn/PostBureauRiskCategory.kt      |  2 +-
 .../kotlin/dmn/PostBureauRiskCategoryTable.kt |  2 +-
 .../kotlin/dmn/PreBureauAffordability.kt      |  2 +-
 .../kotlin/dmn/PreBureauRiskCategory.kt       |  2 +-
 .../kotlin/dmn/PreBureauRiskCategoryTable.kt  |  2 +-
 .../kotlin/dmn/RequiredMonthlyInstallment.kt  |  2 +-
 .../translator/expected/kotlin/dmn/Routing.kt |  2 +-
 .../expected/kotlin/dmn/RoutingRules.kt       |  2 +-
 .../expected/kotlin/dmn/Strategy.kt           |  2 +-
 .../expected/java/dmn/MonthlyPayment.java     |  2 +-
 .../translator/expected/java/dmn/PMT.java     |  2 +-
 .../expected/kotlin/dmn/MonthlyPayment.kt     |  2 +-
 .../translator/expected/kotlin/dmn/PMT.kt     |  2 +-
 .../translator/expected/java/dmn/Join.java    |  2 +-
 .../translator/expected/kotlin/dmn/Join.kt    |  2 +-
 .../translator/expected/java/dmn/Sort1.java   |  2 +-
 .../translator/expected/java/dmn/Sort2.java   |  2 +-
 .../translator/expected/java/dmn/Sort3.java   |  2 +-
 .../translator/expected/kotlin/dmn/Sort1.kt   |  2 +-
 .../translator/expected/kotlin/dmn/Sort2.kt   |  2 +-
 .../translator/expected/kotlin/dmn/Sort3.kt   |  2 +-
 .../expected/java/dmn/Bankrates.java          |  2 +-
 .../expected/java/dmn/Equity36Mo.java         |  2 +-
 .../expected/java/dmn/FinancialMetrics.java   |  2 +-
 .../expected/java/dmn/MonthlyPayment.java     |  2 +-
 .../expected/java/dmn/RankedProducts.java     |  2 +-
 .../expected/kotlin/dmn/Bankrates.kt          |  2 +-
 .../expected/kotlin/dmn/Equity36Mo.kt         |  2 +-
 .../expected/kotlin/dmn/FinancialMetrics.kt   |  2 +-
 .../expected/kotlin/dmn/MonthlyPayment.kt     |  2 +-
 .../expected/kotlin/dmn/RankedProducts.kt     |  2 +-
 .../expected/java/dmn/EveryGtTen1.java        |  2 +-
 .../expected/java/dmn/EveryGtTen2.java        |  2 +-
 .../expected/java/dmn/EveryGtTen3.java        |  2 +-
 .../translator/expected/java/dmn/GtTen.java   |  2 +-
 .../expected/java/dmn/PriceTable1.java        |  2 +-
 .../expected/java/dmn/SomeGtTen1.java         |  2 +-
 .../expected/java/dmn/SomeGtTen2.java         |  2 +-
 .../expected/kotlin/dmn/EveryGtTen1.kt        |  2 +-
 .../expected/kotlin/dmn/EveryGtTen2.kt        |  2 +-
 .../expected/kotlin/dmn/EveryGtTen3.kt        |  2 +-
 .../translator/expected/kotlin/dmn/GtTen.kt   |  2 +-
 .../expected/kotlin/dmn/PriceTable1.kt        |  2 +-
 .../expected/kotlin/dmn/SomeGtTen1.kt         |  2 +-
 .../expected/kotlin/dmn/SomeGtTen2.kt         |  2 +-
 .../expected/java/dmn/DateCompare1.java       | 10 ++---
 .../expected/java/dmn/DateCompare2.java       | 12 +++---
 .../expected/java/dmn/PriceGt10.java          |  2 +-
 .../expected/java/dmn/PriceInRange.java       |  2 +-
 .../expected/kotlin/dmn/DateCompare1.kt       | 10 ++---
 .../expected/kotlin/dmn/DateCompare2.kt       | 10 ++---
 .../expected/kotlin/dmn/PriceGt10.kt          |  2 +-
 .../expected/kotlin/dmn/PriceInRange.kt       |  2 +-
 .../expected/java/dmn/BaseVacationDays.java   |  2 +-
 .../expected/java/dmn/ExtraDaysCase1.java     |  2 +-
 .../expected/java/dmn/ExtraDaysCase2.java     |  2 +-
 .../expected/java/dmn/ExtraDaysCase3.java     |  2 +-
 .../expected/java/dmn/TotalVacationDays.java  |  2 +-
 .../expected/kotlin/dmn/BaseVacationDays.kt   |  2 +-
 .../expected/kotlin/dmn/ExtraDaysCase1.kt     |  2 +-
 .../expected/kotlin/dmn/ExtraDaysCase2.kt     |  2 +-
 .../expected/kotlin/dmn/ExtraDaysCase3.kt     |  2 +-
 .../expected/kotlin/dmn/TotalVacationDays.kt  |  2 +-
 .../expected/java/dmn/Decision1.java          |  2 +-
 .../expected/java/dmn/Decision2.java          |  2 +-
 .../expected/java/dmn/Decision3.java          |  2 +-
 .../expected/java/dmn/Decision4.java          |  2 +-
 .../expected/java/dmn/Decision5.java          |  2 +-
 .../expected/kotlin/dmn/Decision1.kt          |  2 +-
 .../expected/kotlin/dmn/Decision2.kt          |  2 +-
 .../expected/kotlin/dmn/Decision3.kt          |  2 +-
 .../expected/kotlin/dmn/Decision4.kt          |  2 +-
 .../expected/kotlin/dmn/Decision5.kt          |  2 +-
 .../java/dmn/NamedFunctionInvocation.java     |  2 +-
 .../java/dmn/SimpleFunctionInvocation.java    |  2 +-
 .../kotlin/dmn/NamedFunctionInvocation.kt     |  2 +-
 .../kotlin/dmn/SimpleFunctionInvocation.kt    |  2 +-
 .../expected/java/dmn/Circumference.java      |  2 +-
 .../dmn/FnInvocationComplexParameters.java    |  2 +-
 .../java/dmn/FnInvocationNamedParameters.java |  2 +-
 .../dmn/FnInvocationPositionalParameters.java |  2 +-
 .../expected/java/dmn/FnLibrary.java          |  2 +-
 .../expected/kotlin/dmn/Circumference.kt      |  2 +-
 .../dmn/FnInvocationComplexParameters.kt      |  2 +-
 .../kotlin/dmn/FnInvocationNamedParameters.kt |  2 +-
 .../dmn/FnInvocationPositionalParameters.kt   |  2 +-
 .../expected/kotlin/dmn/FnLibrary.kt          |  2 +-
 .../translator/expected/java/dmn/FACT.java    |  2 +-
 .../translator/expected/java/dmn/Main.java    |  2 +-
 .../translator/expected/kotlin/dmn/FACT.kt    |  2 +-
 .../translator/expected/kotlin/dmn/Main.kt    |  2 +-
 .../java/dmn/Applicant_repository.java        |  2 +-
 .../expected/java/dmn/Boxed_001.java          |  2 +-
 .../expected/java/dmn/Incorrect_001.java      |  2 +-
 .../expected/java/dmn/Incorrect_002.java      |  2 +-
 .../expected/java/dmn/Incorrect_003.java      |  2 +-
 .../expected/java/dmn/Literal_001.java        |  2 +-
 .../expected/java/dmn/Literal_002.java        |  2 +-
 .../expected/java/dmn/Literal_003.java        |  2 +-
 .../expected/java/dmn/Literal_004.java        |  2 +-
 .../expected/java/dmn/Literal_005.java        |  2 +-
 .../expected/java/dmn/Literal_006.java        |  2 +-
 .../expected/java/dmn/Literal_007.java        |  2 +-
 .../expected/java/dmn/Literal_007_a.java      |  2 +-
 .../expected/java/dmn/Literal_008.java        |  2 +-
 .../expected/java/dmn/Literal_009.java        |  2 +-
 .../expected/java/dmn/Literal_010.java        |  2 +-
 .../expected/java/dmn/Literal_011.java        |  2 +-
 .../expected/java/dmn/Literal_012.java        |  2 +-
 .../expected/java/dmn/Varargs_001.java        |  2 +-
 .../expected/java/dmn/Adjudication.java       |  2 +-
 .../java/dmn/AffordabilityCalculation.java    |  2 +-
 .../java/dmn/ApplicationRiskScore.java        |  2 +-
 .../java/dmn/ApplicationRiskScoreModel.java   |  2 +-
 .../expected/java/dmn/BureauCallType.java     |  2 +-
 .../java/dmn/BureauCallTypeTable.java         |  2 +-
 .../dmn/CreditContingencyFactorTable.java     |  2 +-
 .../expected/java/dmn/Eligibility.java        |  2 +-
 .../expected/java/dmn/EligibilityRules.java   |  2 +-
 .../java/dmn/InstallmentCalculation.java      |  2 +-
 .../java/dmn/PostBureauAffordability.java     |  2 +-
 .../java/dmn/PostBureauRiskCategory.java      |  2 +-
 .../java/dmn/PostBureauRiskCategoryTable.java |  2 +-
 .../java/dmn/PreBureauAffordability.java      |  2 +-
 .../java/dmn/PreBureauRiskCategory.java       |  2 +-
 .../java/dmn/PreBureauRiskCategoryTable.java  |  2 +-
 .../java/dmn/RequiredMonthlyInstallment.java  |  2 +-
 .../translator/expected/java/dmn/Routing.java |  2 +-
 .../expected/java/dmn/RoutingRules.java       |  2 +-
 .../expected/java/dmn/Strategy.java           |  2 +-
 .../src/main/java/BaseVacationDays.java       |  2 +-
 .../src/main/java/ExtraDaysCase1.java         |  2 +-
 .../src/main/java/ExtraDaysCase2.java         |  2 +-
 .../src/main/java/ExtraDaysCase3.java         |  2 +-
 .../src/main/java/TotalVacationDays.java      |  2 +-
 .../java/dmn/DecisionService_001.java         |  2 +-
 .../java/dmn/DecisionService_002.java         |  2 +-
 .../java/dmn/DecisionService_003.java         |  2 +-
 .../java/dmn/DecisionService_004.java         |  2 +-
 .../java/dmn/DecisionService_006.java         |  2 +-
 .../java/dmn/DecisionService_007.java         |  2 +-
 .../java/dmn/DecisionService_009.java         |  2 +-
 .../java/dmn/DecisionService_011.java         |  2 +-
 .../java/dmn/DecisionService_012.java         |  2 +-
 .../java/dmn/DecisionService_013.java         |  2 +-
 .../java/dmn/DecisionService_014.java         |  2 +-
 .../expected/java/dmn/Decision_001.java       |  2 +-
 .../expected/java/dmn/Decision_002.java       |  2 +-
 .../expected/java/dmn/Decision_002_input.java |  2 +-
 .../expected/java/dmn/Decision_003.java       |  2 +-
 .../java/dmn/Decision_003_input_1.java        |  2 +-
 .../java/dmn/Decision_003_input_2.java        |  2 +-
 .../expected/java/dmn/Decision_004_1.java     |  2 +-
 .../expected/java/dmn/Decision_004_2.java     |  2 +-
 .../expected/java/dmn/Decision_006_1.java     |  2 +-
 .../expected/java/dmn/Decision_006_2.java     |  2 +-
 .../expected/java/dmn/Decision_006_3.java     |  2 +-
 .../expected/java/dmn/Decision_007_2.java     |  2 +-
 .../expected/java/dmn/Decision_007_3.java     |  2 +-
 .../expected/java/dmn/Decision_009_1.java     |  2 +-
 .../expected/java/dmn/Decision_009_2.java     |  2 +-
 .../expected/java/dmn/Decision_009_3.java     |  2 +-
 .../expected/java/dmn/Decision_011_1.java     |  2 +-
 .../expected/java/dmn/Decision_011_2.java     |  2 +-
 .../expected/java/dmn/Decision_011_3.java     |  2 +-
 .../expected/java/dmn/Decision_011_4.java     |  2 +-
 .../expected/java/dmn/Decision_012_1.java     |  2 +-
 .../expected/java/dmn/Decision_012_2.java     |  2 +-
 .../expected/java/dmn/Decision_012_3.java     |  2 +-
 .../expected/java/dmn/Decision_012_4.java     |  2 +-
 .../expected/java/dmn/Decision_013_1.java     |  2 +-
 .../expected/java/dmn/Decision_013_2.java     |  2 +-
 .../expected/java/dmn/Decision_013_3.java     |  2 +-
 .../expected/java/dmn/Decision_014_1.java     |  2 +-
 .../expected/java/dmn/Decision_014_2.java     |  2 +-
 .../expected/java/dmn/Decision_014_3.java     |  2 +-
 .../expected/java/dmn/Bkm_003_1.java          |  2 +-
 .../expected/java/dmn/Bkm_004_1.java          |  2 +-
 .../expected/java/dmn/Bkm_005_1.java          |  2 +-
 .../expected/java/dmn/Bkm_006_1.java          |  2 +-
 .../expected/java/dmn/Bkm_008_1.java          |  2 +-
 .../expected/java/dmn/Bkm_009_1.java          |  2 +-
 .../expected/java/dmn/Bkm_010_1.java          |  2 +-
 .../expected/java/dmn/Bkm_010_1_a.java        |  2 +-
 .../expected/java/dmn/Bkm_011_1.java          |  2 +-
 .../expected/java/dmn/Bkm_012_1.java          |  2 +-
 .../expected/java/dmn/Bkm_012_2.java          |  2 +-
 .../expected/java/dmn/Bkm_013_1.java          |  2 +-
 .../expected/java/dmn/Bkm_017_1.java          |  2 +-
 .../translator/expected/java/dmn/Bkm_018.java |  2 +-
 .../java/dmn/DecisionService_013_1.java       |  2 +-
 .../expected/java/dmn/Decision_001_1.java     |  2 +-
 .../expected/java/dmn/Decision_001_2.java     |  2 +-
 .../expected/java/dmn/Decision_002_1.java     |  2 +-
 .../expected/java/dmn/Decision_002_2.java     |  2 +-
 .../expected/java/dmn/Decision_003_1.java     |  2 +-
 .../expected/java/dmn/Decision_004_1.java     |  2 +-
 .../expected/java/dmn/Decision_005_1.java     |  2 +-
 .../expected/java/dmn/Decision_006_1.java     |  2 +-
 .../expected/java/dmn/Decision_007_1.java     |  2 +-
 .../expected/java/dmn/Decision_007_2.java     |  2 +-
 .../expected/java/dmn/Decision_008_1.java     |  2 +-
 .../expected/java/dmn/Decision_009_1.java     |  2 +-
 .../expected/java/dmn/Decision_010_1.java     |  2 +-
 .../expected/java/dmn/Decision_010_1_a.java   |  2 +-
 .../expected/java/dmn/Decision_010_2.java     |  2 +-
 .../expected/java/dmn/Decision_010_2_a.java   |  2 +-
 .../expected/java/dmn/Decision_011_1.java     |  2 +-
 .../expected/java/dmn/Decision_012_1.java     |  2 +-
 .../expected/java/dmn/Decision_013_1.java     |  2 +-
 .../expected/java/dmn/Decision_013_2.java     |  2 +-
 .../expected/java/dmn/Decision_017_1.java     |  2 +-
 .../expected/java/dmn/Decision_018.java       |  2 +-
 348 files changed, 522 insertions(+), 511 deletions(-)

diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToJavaTransformerTest.java
index 227213d7f..222eaf4ff 100644
--- a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToJavaTransformerTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToJavaTransformerTest.java
@@ -13,6 +13,7 @@
 package com.gs.dmn.transformation;
 
 import com.gs.dmn.dialect.DMNDialectDefinition;
+import com.gs.dmn.dialect.JavaTimeDMNDialectDefinition;
 import com.gs.dmn.dialect.StandardDMNDialectDefinition;
 import com.gs.dmn.tck.ast.TestCases;
 import com.gs.dmn.transformation.template.TemplateProvider;
@@ -21,11 +22,14 @@
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalAmount;
 
-public abstract class AbstractTckDMNToJavaTransformerTest extends AbstractTckDMNToNativeTransformerTest<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregorianCalendar, Duration> {
+public abstract class AbstractTckDMNToJavaTransformerTest extends AbstractTckDMNToNativeTransformerTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregorianCalendar, Duration, TestCases> makeDialectDefinition() {
-        return new StandardDMNDialectDefinition();
+    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
+        return new JavaTimeDMNDialectDefinition();
     }
 
     @Override
diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToKotlinTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToKotlinTransformerTest.java
index 4084c8c74..0b385a5bc 100644
--- a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToKotlinTransformerTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToKotlinTransformerTest.java
@@ -13,6 +13,7 @@
 package com.gs.dmn.transformation;
 
 import com.gs.dmn.dialect.DMNDialectDefinition;
+import com.gs.dmn.dialect.JavaTimeKotlinStandardDMNDialectDefinition;
 import com.gs.dmn.dialect.KotlinStandardDMNDialectDefinition;
 import com.gs.dmn.tck.ast.TestCases;
 import com.gs.dmn.transformation.template.KotlinTreeTemplateProvider;
@@ -21,11 +22,14 @@
 import javax.xml.datatype.Duration;
 import javax.xml.datatype.XMLGregorianCalendar;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalAmount;
 
-public abstract class AbstractTckDMNToKotlinTransformerTest extends AbstractTckDMNToNativeTransformerTest<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregorianCalendar, Duration> {
+public abstract class AbstractTckDMNToKotlinTransformerTest extends AbstractTckDMNToNativeTransformerTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregorianCalendar, Duration, TestCases> makeDialectDefinition() {
-        return new KotlinStandardDMNDialectDefinition();
+    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
+        return new JavaTimeKotlinStandardDMNDialectDefinition();
     }
 
     @Override
diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java
index 4263fb8da..dbd8de94e 100644
--- a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java
@@ -30,6 +30,9 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 import java.io.File;
 import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAccessor;
+import java.time.temporal.TemporalAmount;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -47,7 +50,7 @@ protected String getExpectedPath() {
     @Override
     protected FileTransformer makeTransformer(InputParameters inputParameters, BuildLogger logger) {
         // Create transformer
-        DMNDialectDefinition<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregorianCalendar, Duration, TestCases> dmnDialect = makeDialectDefinition();
+        DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> dmnDialect = makeDialectDefinition();
         DMNValidator dmnValidator = makeDMNValidator(logger);
         DMNTransformer<TestCases> dmnTransformer = makeDMNTransformer(logger);
         TemplateProvider templateProvider = makeTemplateProvider();
diff --git a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/EvaluatingB1SayHello.java b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/EvaluatingB1SayHello.java
index 775668a33..bf9775a76 100644
--- a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/EvaluatingB1SayHello.java
+++ b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/EvaluatingB1SayHello.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EvaluatingB1SayHello extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EvaluatingB1SayHello extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "evaluatingB1SayHello",
diff --git a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/EvaluatingB2SayHello.java b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/EvaluatingB2SayHello.java
index 206f872f9..9030d66c1 100644
--- a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/EvaluatingB2SayHello.java
+++ b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/EvaluatingB2SayHello.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EvaluatingB2SayHello extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EvaluatingB2SayHello extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "evaluatingB2SayHello",
diff --git a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/GreetThePerson.java b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/GreetThePerson.java
index 7eca1b54b..20a138c69 100644
--- a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/GreetThePerson.java
+++ b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/GreetThePerson.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class GreetThePerson extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class GreetThePerson extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "greetThePerson",
diff --git a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/ModelCDecisionBasedOnBs.java b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/ModelCDecisionBasedOnBs.java
index 427f015aa..c667e718c 100644
--- a/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/ModelCDecisionBasedOnBs.java
+++ b/dmn-test-cases/standard/composite/1.2/0001-no-name-conflicts-one-package/translator/expected/java/dmn/ModelCDecisionBasedOnBs.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class ModelCDecisionBasedOnBs extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ModelCDecisionBasedOnBs extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "modelCDecisionBasedOnBs",
diff --git a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b1/EvaluatingB1SayHello.java b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b1/EvaluatingB1SayHello.java
index d06ae82f2..e38a6d9c5 100644
--- a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b1/EvaluatingB1SayHello.java
+++ b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b1/EvaluatingB1SayHello.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EvaluatingB1SayHello extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EvaluatingB1SayHello extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b1",
         "evaluatingB1SayHello",
diff --git a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b1/GreetThePerson.java b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b1/GreetThePerson.java
index cebe42c18..4364b6314 100644
--- a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b1/GreetThePerson.java
+++ b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b1/GreetThePerson.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class GreetThePerson extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class GreetThePerson extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b1",
         "greetThePerson",
diff --git a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b2/EvaluatingB2SayHello.java b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b2/EvaluatingB2SayHello.java
index c2bfd3e99..5562769a4 100644
--- a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b2/EvaluatingB2SayHello.java
+++ b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_b2/EvaluatingB2SayHello.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EvaluatingB2SayHello extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EvaluatingB2SayHello extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b2",
         "evaluatingB2SayHello",
diff --git a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_c/ModelCDecisionBasedOnBs.java b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_c/ModelCDecisionBasedOnBs.java
index 93f43b03a..331825bc1 100644
--- a/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_c/ModelCDecisionBasedOnBs.java
+++ b/dmn-test-cases/standard/composite/1.2/0002-no-name-conflicts/translator/expected/java/dmn/model_c/ModelCDecisionBasedOnBs.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class ModelCDecisionBasedOnBs extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ModelCDecisionBasedOnBs extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_c",
         "modelCDecisionBasedOnBs",
diff --git a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b1/EvaluatingSayHello.java b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b1/EvaluatingSayHello.java
index 60130d8ae..91158cc29 100644
--- a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b1/EvaluatingSayHello.java
+++ b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b1/EvaluatingSayHello.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EvaluatingSayHello extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EvaluatingSayHello extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b1",
         "evaluatingSayHello",
diff --git a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b1/GreetThePerson.java b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b1/GreetThePerson.java
index cebe42c18..4364b6314 100644
--- a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b1/GreetThePerson.java
+++ b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b1/GreetThePerson.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class GreetThePerson extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class GreetThePerson extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b1",
         "greetThePerson",
diff --git a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b2/EvaluatingSayHello.java b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b2/EvaluatingSayHello.java
index c3ec559fe..28f088f50 100644
--- a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b2/EvaluatingSayHello.java
+++ b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_b2/EvaluatingSayHello.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EvaluatingSayHello extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EvaluatingSayHello extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b2",
         "evaluatingSayHello",
diff --git a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_c/ModelCDecisionBasedOnBs.java b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_c/ModelCDecisionBasedOnBs.java
index 631e8e1c4..18f8b10a6 100644
--- a/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_c/ModelCDecisionBasedOnBs.java
+++ b/dmn-test-cases/standard/composite/1.2/0003-name-conflicts/translator/expected/java/dmn/model_c/ModelCDecisionBasedOnBs.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class ModelCDecisionBasedOnBs extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ModelCDecisionBasedOnBs extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_c",
         "modelCDecisionBasedOnBs",
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/DateCompare1.java b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/DateCompare1.java
index 3c70e522f..7ff980a7a 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/DateCompare1.java
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/DateCompare1.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class DateCompare1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DateCompare1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "decisiontables",
         "dateCompare1",
@@ -37,7 +37,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.time.LocalDate decisioninputs_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'dateCompare1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -65,7 +65,7 @@ public Boolean apply(javax.xml.datatype.XMLGregorianCalendar decisioninputs_date
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateD = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
+                java.time.LocalDate decisioninputs_dateD = 0 < args_.length ? (java.time.LocalDate) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -92,7 +92,7 @@ public Boolean apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.time.LocalDate decisioninputs_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -123,7 +123,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalend
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.time.LocalDate decisioninputs_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/DateCompare2.java b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/DateCompare2.java
index a938c9e61..02fddcd5c 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/DateCompare2.java
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/DateCompare2.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class DateCompare2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DateCompare2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "decisiontables",
         "dateCompare2",
@@ -37,7 +37,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateD, javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateE, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.time.LocalDate decisioninputs_dateD, java.time.LocalDate decisioninputs_dateE, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'dateCompare2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,8 +66,8 @@ public Boolean apply(javax.xml.datatype.XMLGregorianCalendar decisioninputs_date
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateD = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
-                javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateE = 1 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[1] : null;
+                java.time.LocalDate decisioninputs_dateD = 0 < args_.length ? (java.time.LocalDate) args_[0] : null;
+                java.time.LocalDate decisioninputs_dateE = 1 < args_.length ? (java.time.LocalDate) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -94,7 +94,7 @@ public Boolean apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateD, javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateE, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.time.LocalDate decisioninputs_dateD, java.time.LocalDate decisioninputs_dateE, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -125,7 +125,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalend
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateD, javax.xml.datatype.XMLGregorianCalendar decisioninputs_dateE, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.time.LocalDate decisioninputs_dateD, java.time.LocalDate decisioninputs_dateE, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceGt10.java b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceGt10.java
index 6fe79f698..93b57408a 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceGt10.java
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceGt10.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class PriceGt10 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PriceGt10 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "decisiontables",
         "priceGt10",
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceInRange.java b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceInRange.java
index e5a599ec8..9fe6b5d4a 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceInRange.java
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceInRange.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 2
 )
-public class PriceInRange extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PriceInRange extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "decisiontables",
         "priceInRange",
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/DateCompare1.java b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/DateCompare1.java
index 6c6f21b32..277fd5de2 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/DateCompare1.java
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/DateCompare1.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class DateCompare1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DateCompare1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "decisiontables",
         "dateCompare1",
@@ -37,7 +37,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.time.LocalDate decisioninputs1_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'dateCompare1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -65,7 +65,7 @@ public Boolean apply(javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dat
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dateD = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
+                java.time.LocalDate decisioninputs1_dateD = 0 < args_.length ? (java.time.LocalDate) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -92,7 +92,7 @@ public Boolean apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.time.LocalDate decisioninputs1_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -123,7 +123,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalend
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.time.LocalDate decisioninputs1_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/DateCompare2.java b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/DateCompare2.java
index 261889a33..056786df6 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/DateCompare2.java
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/DateCompare2.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class DateCompare2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DateCompare2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "decisiontables",
         "dateCompare2",
@@ -37,7 +37,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dateD, javax.xml.datatype.XMLGregorianCalendar decisioninputs2_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.time.LocalDate decisioninputs1_dateD, java.time.LocalDate decisioninputs2_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'dateCompare2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,8 +66,8 @@ public Boolean apply(javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dat
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dateD = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
-                javax.xml.datatype.XMLGregorianCalendar decisioninputs2_dateD = 1 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[1] : null;
+                java.time.LocalDate decisioninputs1_dateD = 0 < args_.length ? (java.time.LocalDate) args_[0] : null;
+                java.time.LocalDate decisioninputs2_dateD = 1 < args_.length ? (java.time.LocalDate) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -94,7 +94,7 @@ public Boolean apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dateD, javax.xml.datatype.XMLGregorianCalendar decisioninputs2_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.time.LocalDate decisioninputs1_dateD, java.time.LocalDate decisioninputs2_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -125,7 +125,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalend
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(javax.xml.datatype.XMLGregorianCalendar decisioninputs1_dateD, javax.xml.datatype.XMLGregorianCalendar decisioninputs2_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.time.LocalDate decisioninputs1_dateD, java.time.LocalDate decisioninputs2_dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceGt10.java b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceGt10.java
index c039939fe..ded240a0f 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceGt10.java
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceGt10.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class PriceGt10 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PriceGt10 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "decisiontables",
         "priceGt10",
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceInRange.java b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceInRange.java
index 024de0abd..822cc2b34 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceInRange.java
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceInRange.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 2
 )
-public class PriceInRange extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PriceInRange extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "decisiontables",
         "priceInRange",
diff --git a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_a/GreetThePerson.java b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_a/GreetThePerson.java
index 6ca28960d..cbbba9049 100644
--- a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_a/GreetThePerson.java
+++ b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_a/GreetThePerson.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class GreetThePerson extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class GreetThePerson extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_a",
         "Greet the Person",
diff --git a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_b/EvaluatingSayHello.java b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_b/EvaluatingSayHello.java
index 3a1b28aa3..9f6e96b49 100644
--- a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_b/EvaluatingSayHello.java
+++ b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_b/EvaluatingSayHello.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EvaluatingSayHello extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EvaluatingSayHello extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b",
         "Evaluating Say Hello",
diff --git a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_b2/EvaluatingB2SayHello.java b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_b2/EvaluatingB2SayHello.java
index 8c8cccf0a..648e66138 100644
--- a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_b2/EvaluatingB2SayHello.java
+++ b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/model_b2/EvaluatingB2SayHello.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EvaluatingB2SayHello extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EvaluatingB2SayHello extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b2",
         "Evaluating B2 Say Hello",
diff --git a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/nested_input_data_imports/ModelCDecisionBasedOnBs.java b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/nested_input_data_imports/ModelCDecisionBasedOnBs.java
index 7385693fa..5b5d229f4 100644
--- a/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/nested_input_data_imports/ModelCDecisionBasedOnBs.java
+++ b/dmn-test-cases/standard/composite/1.2/0006-multiple-input-data/translator/expected/java/dmn/nested_input_data_imports/ModelCDecisionBasedOnBs.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class ModelCDecisionBasedOnBs extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ModelCDecisionBasedOnBs extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "nested_input_data_imports",
         "Model C Decision based on Bs",
diff --git a/dmn-test-cases/standard/composite/1.2/0007-name-conflicts-same-decision-singleton/translator/expected/java/dmn/model_c/C.java b/dmn-test-cases/standard/composite/1.2/0007-name-conflicts-same-decision-singleton/translator/expected/java/dmn/model_c/C.java
index e8b57ed68..a4315edc0 100644
--- a/dmn-test-cases/standard/composite/1.2/0007-name-conflicts-same-decision-singleton/translator/expected/java/dmn/model_c/C.java
+++ b/dmn-test-cases/standard/composite/1.2/0007-name-conflicts-same-decision-singleton/translator/expected/java/dmn/model_c/C.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class C extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class C extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_c",
         "c",
diff --git a/dmn-test-cases/standard/composite/1.2/0008-name-conflicts-same-decision-no-singleton/translator/expected/java/dmn/model_c/C.java b/dmn-test-cases/standard/composite/1.2/0008-name-conflicts-same-decision-no-singleton/translator/expected/java/dmn/model_c/C.java
index 1f3edb011..8a3d21671 100644
--- a/dmn-test-cases/standard/composite/1.2/0008-name-conflicts-same-decision-no-singleton/translator/expected/java/dmn/model_c/C.java
+++ b/dmn-test-cases/standard/composite/1.2/0008-name-conflicts-same-decision-no-singleton/translator/expected/java/dmn/model_c/C.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class C extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class C extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_c",
         "c",
diff --git a/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/C.java b/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/C.java
index 1cbfcac95..68fe16f1b 100644
--- a/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/C.java
+++ b/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/C.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class C extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class C extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "c",
diff --git a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_a/Bkm.java b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_a/Bkm.java
index 93d0abaae..09c4c3059 100644
--- a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_a/Bkm.java
+++ b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_a/Bkm.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_a",
         "bkm",
diff --git a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_b/Bkm.java b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_b/Bkm.java
index 15058b976..f8d09ad1c 100644
--- a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_b/Bkm.java
+++ b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_b/Bkm.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_b",
         "bkm",
diff --git a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_c/C.java b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_c/C.java
index 7af30dda1..e232a2bd9 100644
--- a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_c/C.java
+++ b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_c/C.java
@@ -13,7 +13,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class C extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class C extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "model_c",
         "c",
diff --git a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassification.java b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassification.java
index 7ac41ce6f..9899a3c4d 100644
--- a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassification.java
+++ b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassification.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class AgeClassification extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class AgeClassification extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "ageClassification",
diff --git a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/CalculateDiscountedPrice.java b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/CalculateDiscountedPrice.java
index e8bdf4e3d..a739ec781 100644
--- a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/CalculateDiscountedPrice.java
+++ b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/CalculateDiscountedPrice.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class CalculateDiscountedPrice extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class CalculateDiscountedPrice extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "calculateDiscountedPrice",
diff --git a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/PriceGt10.java b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/PriceGt10.java
index e3efc7641..c18c02bfa 100644
--- a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/PriceGt10.java
+++ b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/PriceGt10.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class PriceGt10 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PriceGt10 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "priceGt10",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Adjudication.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Adjudication.java
index 3f7c7f029..f4db4a109 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Adjudication.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Adjudication.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Adjudication extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Adjudication extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Adjudication",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/AffordabilityCalculation.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/AffordabilityCalculation.java
index 03027851c..ca29b9ce4 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/AffordabilityCalculation.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/AffordabilityCalculation.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class AffordabilityCalculation extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class AffordabilityCalculation extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "AffordabilityCalculation",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScore.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScore.java
index 59c57ed4a..592e2195d 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScore.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScore.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class ApplicationRiskScore extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApplicationRiskScore extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "ApplicationRiskScore",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModel.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModel.java
index 5a842239f..71c3b7362 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModel.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModel.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 11
 )
-public class ApplicationRiskScoreModel extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApplicationRiskScoreModel extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "ApplicationRiskScoreModel",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/BureauCallType.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/BureauCallType.java
index 701596f63..784d60a6c 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/BureauCallType.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/BureauCallType.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class BureauCallType extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class BureauCallType extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "BureauCallType",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/BureauCallTypeTable.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/BureauCallTypeTable.java
index 10204a718..27dc06595 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/BureauCallTypeTable.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/BureauCallTypeTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class BureauCallTypeTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class BureauCallTypeTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "BureauCallTypeTable",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTable.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTable.java
index 27003568c..39988fd1e 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTable.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class CreditContingencyFactorTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class CreditContingencyFactorTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "CreditContingencyFactorTable",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Eligibility.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Eligibility.java
index b613bfec7..89503b5c9 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Eligibility.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Eligibility.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Eligibility extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Eligibility extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Eligibility",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/EligibilityRules.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/EligibilityRules.java
index 2dc90706a..c186e78a1 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/EligibilityRules.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/EligibilityRules.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 4
 )
-public class EligibilityRules extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EligibilityRules extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "EligibilityRules",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/InstallmentCalculation.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/InstallmentCalculation.java
index 27bdbe45d..cd3e17db3 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/InstallmentCalculation.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/InstallmentCalculation.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class InstallmentCalculation extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class InstallmentCalculation extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "InstallmentCalculation",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauAffordability.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauAffordability.java
index 1c5e93edc..cb1f8417b 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauAffordability.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauAffordability.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PostBureauAffordability extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauAffordability extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauAffordability",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategory.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategory.java
index 7669f4e30..1344ce0f3 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategory.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategory.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PostBureauRiskCategory extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauRiskCategory extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauRiskCategory",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategoryTable.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategoryTable.java
index c0f933a6b..ec2e18c1c 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategoryTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 13
 )
-public class PostBureauRiskCategoryTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauRiskCategoryTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauRiskCategoryTable",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauAffordability.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauAffordability.java
index 9b765b572..d5a9090b6 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauAffordability.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauAffordability.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PreBureauAffordability extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauAffordability extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauAffordability",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategory.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategory.java
index 284d851f3..97edec3e2 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategory.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategory.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PreBureauRiskCategory extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauRiskCategory extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauRiskCategory",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategoryTable.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategoryTable.java
index c6430928c..5ce913feb 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategoryTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 8
 )
-public class PreBureauRiskCategoryTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauRiskCategoryTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauRiskCategoryTable",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RequiredMonthlyInstallment.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RequiredMonthlyInstallment.java
index cfa0aacd3..72452d7f9 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RequiredMonthlyInstallment.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RequiredMonthlyInstallment.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class RequiredMonthlyInstallment extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class RequiredMonthlyInstallment extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "RequiredMonthlyInstallment",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Routing.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Routing.java
index db3f12ffe..507a3ce9d 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Routing.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Routing.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Routing extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Routing extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Routing",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RoutingRules.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RoutingRules.java
index 39aef627e..787d9d796 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RoutingRules.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RoutingRules.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 5
 )
-public class RoutingRules extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class RoutingRules extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "RoutingRules",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Strategy.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Strategy.java
index 54a87ea2b..596178a18 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Strategy.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Strategy.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class Strategy extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Strategy extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Strategy",
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Adjudication.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Adjudication.kt
index 8ce1ac6f1..7d5efd2c6 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Adjudication.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Adjudication.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Adjudication() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Adjudication() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("BureauData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TBureauDataImpl>() {}) }), input_.get("SupportingDocuments"), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/AffordabilityCalculation.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/AffordabilityCalculation.kt
index fb08d44da..aef99ea20 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/AffordabilityCalculation.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/AffordabilityCalculation.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class AffordabilityCalculation : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class AffordabilityCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScore.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScore.kt
index 27dde51ac..faebb4992 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScore.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScore.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class ApplicationRiskScore() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModel.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModel.kt
index 6b3ebe282..3bf373bde 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModel.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/ApplicationRiskScoreModel.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 11
 )
-class ApplicationRiskScoreModel : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/BureauCallType.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/BureauCallType.kt
index 149c22355..f7e66be3b 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/BureauCallType.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/BureauCallType.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class BureauCallType(val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class BureauCallType(val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/BureauCallTypeTable.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/BureauCallTypeTable.kt
index e3bbf1915..cac9cd53f 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/BureauCallTypeTable.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/BureauCallTypeTable.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-class BureauCallTypeTable : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class BureauCallTypeTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTable.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTable.kt
index b9065ebd1..ea3d684eb 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTable.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/CreditContingencyFactorTable.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-class CreditContingencyFactorTable : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Eligibility.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Eligibility.kt
index 45a98ece9..614bee691 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Eligibility.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Eligibility.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Eligibility(val preBureauAffordability : PreBureauAffordability = PreBureauAffordability(), val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Eligibility(val preBureauAffordability : PreBureauAffordability = PreBureauAffordability(), val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/EligibilityRules.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/EligibilityRules.kt
index cabc462e8..4a64bf750 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/EligibilityRules.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/EligibilityRules.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 4
 )
-class EligibilityRules : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/InstallmentCalculation.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/InstallmentCalculation.kt
index 793888169..30ff80528 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/InstallmentCalculation.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/InstallmentCalculation.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class InstallmentCalculation : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauAffordability.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauAffordability.kt
index 4e9e72d54..1601f10de 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauAffordability.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauAffordability.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PostBureauAffordability(val postBureauRiskCategory : PostBureauRiskCategory = PostBureauRiskCategory(), val requiredMonthlyInstallment : RequiredMonthlyInstallment = RequiredMonthlyInstallment()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PostBureauAffordability(val postBureauRiskCategory : PostBureauRiskCategory = PostBureauRiskCategory(), val requiredMonthlyInstallment : RequiredMonthlyInstallment = RequiredMonthlyInstallment()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("BureauData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TBureauDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategory.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategory.kt
index 90418e33a..5837b4984 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategory.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategory.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PostBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = ApplicationRiskScore()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PostBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = ApplicationRiskScore()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("BureauData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TBureauDataImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategoryTable.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategoryTable.kt
index 94a2bfa65..84acae432 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategoryTable.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PostBureauRiskCategoryTable.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 13
 )
-class PostBureauRiskCategoryTable : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauAffordability.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauAffordability.kt
index 2582b5075..7dca9bfc3 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauAffordability.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauAffordability.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PreBureauAffordability(val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory(), val requiredMonthlyInstallment : RequiredMonthlyInstallment = RequiredMonthlyInstallment()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PreBureauAffordability(val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory(), val requiredMonthlyInstallment : RequiredMonthlyInstallment = RequiredMonthlyInstallment()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategory.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategory.kt
index e9bc64c6b..9dcaca243 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategory.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategory.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PreBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = ApplicationRiskScore()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PreBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = ApplicationRiskScore()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategoryTable.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategoryTable.kt
index f6e9deff1..2df306611 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategoryTable.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/PreBureauRiskCategoryTable.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 8
 )
-class PreBureauRiskCategoryTable : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RequiredMonthlyInstallment.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RequiredMonthlyInstallment.kt
index cea9417b6..5ab219707 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RequiredMonthlyInstallment.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RequiredMonthlyInstallment.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class RequiredMonthlyInstallment() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Routing.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Routing.kt
index 3cd8a57e6..e270b0616 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Routing.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Routing.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Routing(val postBureauAffordability : PostBureauAffordability = PostBureauAffordability(), val postBureauRiskCategory : PostBureauRiskCategory = PostBureauRiskCategory()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Routing(val postBureauAffordability : PostBureauAffordability = PostBureauAffordability(), val postBureauRiskCategory : PostBureauRiskCategory = PostBureauRiskCategory()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("BureauData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TBureauDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RoutingRules.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RoutingRules.kt
index e7b7273f6..d33e1b267 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RoutingRules.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/RoutingRules.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 5
 )
-class RoutingRules : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Strategy.kt b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Strategy.kt
index 98faa0535..b212f8b4e 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Strategy.kt
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/kotlin/dmn/Strategy.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-class Strategy(val bureauCallType : BureauCallType = BureauCallType(), val eligibility : Eligibility = Eligibility()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Strategy(val bureauCallType : BureauCallType = BureauCallType(), val eligibility : Eligibility = Eligibility()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/CompositeDateTime.java b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/CompositeDateTime.java
index a638d1525..226c3ad3a 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/CompositeDateTime.java
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/CompositeDateTime.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class CompositeDateTime extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class CompositeDateTime extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "CompositeDateTime",
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/Date.java b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/Date.java
index 2c26b5c6f..d34b9c1ef 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/Date.java
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/Date.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Date extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Date extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Date",
@@ -25,7 +25,7 @@ public class Date extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
 
     public static java.util.Map<String, Object> requestToMap(proto.DateRequest dateRequest_) {
         // Create arguments from Request Message
-        javax.xml.datatype.XMLGregorianCalendar inputDate = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.date(dateRequest_.getInputDate());
+        java.time.LocalDate inputDate = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.date(dateRequest_.getInputDate());
 
         // Create map
         java.util.Map<String, Object> map_ = new java.util.LinkedHashMap<>();
@@ -33,16 +33,16 @@ public static java.util.Map<String, Object> requestToMap(proto.DateRequest dateR
         return map_;
     }
 
-    public static javax.xml.datatype.XMLGregorianCalendar responseToOutput(proto.DateResponse dateResponse_) {
+    public static java.time.LocalDate responseToOutput(proto.DateResponse dateResponse_) {
         // Extract and convert output
-        return com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.date(dateResponse_.getDate());
+        return com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.date(dateResponse_.getDate());
     }
 
     public Date() {
     }
 
     @java.lang.Override()
-    public javax.xml.datatype.XMLGregorianCalendar applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.time.LocalDate applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("InputDate") != null ? date(input_.get("InputDate")) : null), context_);
         } catch (Exception e) {
@@ -51,7 +51,7 @@ public javax.xml.datatype.XMLGregorianCalendar applyMap(java.util.Map<String, St
         }
     }
 
-    public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGregorianCalendar inputDate, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.time.LocalDate apply(java.time.LocalDate inputDate, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Date'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -64,7 +64,7 @@ public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGrego
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, dateArguments_);
 
             // Evaluate decision 'Date'
-            javax.xml.datatype.XMLGregorianCalendar output_ = lambda.apply(inputDate, context_);
+            java.time.LocalDate output_ = lambda.apply(inputDate, context_);
 
             // End decision 'Date'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, dateArguments_, output_, (System.currentTimeMillis() - dateStartTime_));
@@ -78,10 +78,10 @@ public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGrego
 
     public proto.DateResponse applyProto(proto.DateRequest dateRequest_, com.gs.dmn.runtime.ExecutionContext context_) {
         // Create arguments from Request Message
-        javax.xml.datatype.XMLGregorianCalendar inputDate = date(dateRequest_.getInputDate());
+        java.time.LocalDate inputDate = date(dateRequest_.getInputDate());
 
         // Invoke apply method
-        javax.xml.datatype.XMLGregorianCalendar output_ = apply(inputDate, context_);
+        java.time.LocalDate output_ = apply(inputDate, context_);
 
         // Convert output to Response Message
         proto.DateResponse.Builder builder_ = proto.DateResponse.newBuilder();
@@ -90,10 +90,10 @@ public proto.DateResponse applyProto(proto.DateRequest dateRequest_, com.gs.dmn.
         return builder_.build();
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<javax.xml.datatype.XMLGregorianCalendar> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<javax.xml.datatype.XMLGregorianCalendar>() {
-            public javax.xml.datatype.XMLGregorianCalendar apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar inputDate = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.time.LocalDate> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.time.LocalDate>() {
+            public java.time.LocalDate apply(Object... args_) {
+                java.time.LocalDate inputDate = 0 < args_.length ? (java.time.LocalDate) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/DateTime.java b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/DateTime.java
index 332e5c8b4..9aa3f28d2 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/DateTime.java
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/DateTime.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DateTime extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DateTime extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "DateTime",
@@ -25,7 +25,7 @@ public class DateTime extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
 
     public static java.util.Map<String, Object> requestToMap(proto.DateTimeRequest dateTimeRequest_) {
         // Create arguments from Request Message
-        javax.xml.datatype.XMLGregorianCalendar inputDateTime = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.dateAndTime(dateTimeRequest_.getInputDateTime());
+        java.time.temporal.TemporalAccessor inputDateTime = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.dateAndTime(dateTimeRequest_.getInputDateTime());
 
         // Create map
         java.util.Map<String, Object> map_ = new java.util.LinkedHashMap<>();
@@ -33,16 +33,16 @@ public static java.util.Map<String, Object> requestToMap(proto.DateTimeRequest d
         return map_;
     }
 
-    public static javax.xml.datatype.XMLGregorianCalendar responseToOutput(proto.DateTimeResponse dateTimeResponse_) {
+    public static java.time.temporal.TemporalAccessor responseToOutput(proto.DateTimeResponse dateTimeResponse_) {
         // Extract and convert output
-        return com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.dateAndTime(dateTimeResponse_.getDateTime());
+        return com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.dateAndTime(dateTimeResponse_.getDateTime());
     }
 
     public DateTime() {
     }
 
     @java.lang.Override()
-    public javax.xml.datatype.XMLGregorianCalendar applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.time.temporal.TemporalAccessor applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("InputDateTime") != null ? dateAndTime(input_.get("InputDateTime")) : null), context_);
         } catch (Exception e) {
@@ -51,7 +51,7 @@ public javax.xml.datatype.XMLGregorianCalendar applyMap(java.util.Map<String, St
         }
     }
 
-    public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGregorianCalendar inputDateTime, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.time.temporal.TemporalAccessor apply(java.time.temporal.TemporalAccessor inputDateTime, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'DateTime'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -64,7 +64,7 @@ public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGrego
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, dateTimeArguments_);
 
             // Evaluate decision 'DateTime'
-            javax.xml.datatype.XMLGregorianCalendar output_ = lambda.apply(inputDateTime, context_);
+            java.time.temporal.TemporalAccessor output_ = lambda.apply(inputDateTime, context_);
 
             // End decision 'DateTime'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, dateTimeArguments_, output_, (System.currentTimeMillis() - dateTimeStartTime_));
@@ -78,10 +78,10 @@ public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGrego
 
     public proto.DateTimeResponse applyProto(proto.DateTimeRequest dateTimeRequest_, com.gs.dmn.runtime.ExecutionContext context_) {
         // Create arguments from Request Message
-        javax.xml.datatype.XMLGregorianCalendar inputDateTime = dateAndTime(dateTimeRequest_.getInputDateTime());
+        java.time.temporal.TemporalAccessor inputDateTime = dateAndTime(dateTimeRequest_.getInputDateTime());
 
         // Invoke apply method
-        javax.xml.datatype.XMLGregorianCalendar output_ = apply(inputDateTime, context_);
+        java.time.temporal.TemporalAccessor output_ = apply(inputDateTime, context_);
 
         // Convert output to Response Message
         proto.DateTimeResponse.Builder builder_ = proto.DateTimeResponse.newBuilder();
@@ -90,10 +90,10 @@ public proto.DateTimeResponse applyProto(proto.DateTimeRequest dateTimeRequest_,
         return builder_.build();
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<javax.xml.datatype.XMLGregorianCalendar> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<javax.xml.datatype.XMLGregorianCalendar>() {
-            public javax.xml.datatype.XMLGregorianCalendar apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar inputDateTime = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.time.temporal.TemporalAccessor> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.time.temporal.TemporalAccessor>() {
+            public java.time.temporal.TemporalAccessor apply(Object... args_) {
+                java.time.temporal.TemporalAccessor inputDateTime = 0 < args_.length ? (java.time.temporal.TemporalAccessor) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/Time.java b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/Time.java
index 56e6130e8..6ba19219b 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/Time.java
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/Time.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Time extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Time extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Time",
@@ -25,7 +25,7 @@ public class Time extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
 
     public static java.util.Map<String, Object> requestToMap(proto.TimeRequest timeRequest_) {
         // Create arguments from Request Message
-        javax.xml.datatype.XMLGregorianCalendar inputTime = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.time(timeRequest_.getInputTime());
+        java.time.temporal.TemporalAccessor inputTime = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.time(timeRequest_.getInputTime());
 
         // Create map
         java.util.Map<String, Object> map_ = new java.util.LinkedHashMap<>();
@@ -33,16 +33,16 @@ public static java.util.Map<String, Object> requestToMap(proto.TimeRequest timeR
         return map_;
     }
 
-    public static javax.xml.datatype.XMLGregorianCalendar responseToOutput(proto.TimeResponse timeResponse_) {
+    public static java.time.temporal.TemporalAccessor responseToOutput(proto.TimeResponse timeResponse_) {
         // Extract and convert output
-        return com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.time(timeResponse_.getTime());
+        return com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.time(timeResponse_.getTime());
     }
 
     public Time() {
     }
 
     @java.lang.Override()
-    public javax.xml.datatype.XMLGregorianCalendar applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.time.temporal.TemporalAccessor applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("InputTime") != null ? time(input_.get("InputTime")) : null), context_);
         } catch (Exception e) {
@@ -51,7 +51,7 @@ public javax.xml.datatype.XMLGregorianCalendar applyMap(java.util.Map<String, St
         }
     }
 
-    public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGregorianCalendar inputTime, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.time.temporal.TemporalAccessor apply(java.time.temporal.TemporalAccessor inputTime, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Time'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -64,7 +64,7 @@ public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGrego
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, timeArguments_);
 
             // Evaluate decision 'Time'
-            javax.xml.datatype.XMLGregorianCalendar output_ = lambda.apply(inputTime, context_);
+            java.time.temporal.TemporalAccessor output_ = lambda.apply(inputTime, context_);
 
             // End decision 'Time'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, timeArguments_, output_, (System.currentTimeMillis() - timeStartTime_));
@@ -78,10 +78,10 @@ public javax.xml.datatype.XMLGregorianCalendar apply(javax.xml.datatype.XMLGrego
 
     public proto.TimeResponse applyProto(proto.TimeRequest timeRequest_, com.gs.dmn.runtime.ExecutionContext context_) {
         // Create arguments from Request Message
-        javax.xml.datatype.XMLGregorianCalendar inputTime = time(timeRequest_.getInputTime());
+        java.time.temporal.TemporalAccessor inputTime = time(timeRequest_.getInputTime());
 
         // Invoke apply method
-        javax.xml.datatype.XMLGregorianCalendar output_ = apply(inputTime, context_);
+        java.time.temporal.TemporalAccessor output_ = apply(inputTime, context_);
 
         // Convert output to Response Message
         proto.TimeResponse.Builder builder_ = proto.TimeResponse.newBuilder();
@@ -90,10 +90,10 @@ public proto.TimeResponse applyProto(proto.TimeRequest timeRequest_, com.gs.dmn.
         return builder_.build();
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<javax.xml.datatype.XMLGregorianCalendar> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<javax.xml.datatype.XMLGregorianCalendar>() {
-            public javax.xml.datatype.XMLGregorianCalendar apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar inputTime = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.time.temporal.TemporalAccessor> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.time.temporal.TemporalAccessor>() {
+            public java.time.temporal.TemporalAccessor apply(Object... args_) {
+                java.time.temporal.TemporalAccessor inputTime = 0 < args_.length ? (java.time.temporal.TemporalAccessor) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/type/CompositeDateTime.java b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/type/CompositeDateTime.java
index b230624bf..0a22ec63d 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/type/CompositeDateTime.java
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/type/CompositeDateTime.java
@@ -14,27 +14,27 @@ static CompositeDateTime toCompositeDateTime(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             CompositeDateTimeImpl result_ = new CompositeDateTimeImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Date")) {
-                result_.setDate((javax.xml.datatype.XMLGregorianCalendar)((com.gs.dmn.runtime.Context)other).get("Date"));
+                result_.setDate((java.time.LocalDate)((com.gs.dmn.runtime.Context)other).get("Date"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Time")) {
-                result_.setTime((javax.xml.datatype.XMLGregorianCalendar)((com.gs.dmn.runtime.Context)other).get("Time"));
+                result_.setTime((java.time.temporal.TemporalAccessor)((com.gs.dmn.runtime.Context)other).get("Time"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("DateTime")) {
-                result_.setDateTime((javax.xml.datatype.XMLGregorianCalendar)((com.gs.dmn.runtime.Context)other).get("DateTime"));
+                result_.setDateTime((java.time.temporal.TemporalAccessor)((com.gs.dmn.runtime.Context)other).get("DateTime"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("YearMonthDuration")) {
-                result_.setYearMonthDuration((javax.xml.datatype.Duration)((com.gs.dmn.runtime.Context)other).get("YearMonthDuration"));
+                result_.setYearMonthDuration((java.time.temporal.TemporalAmount)((com.gs.dmn.runtime.Context)other).get("YearMonthDuration"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("DayTimeDuration")) {
-                result_.setDayTimeDuration((javax.xml.datatype.Duration)((com.gs.dmn.runtime.Context)other).get("DayTimeDuration"));
+                result_.setDayTimeDuration((java.time.temporal.TemporalAmount)((com.gs.dmn.runtime.Context)other).get("DayTimeDuration"));
             } else {
                 return  null;
             }
@@ -43,11 +43,11 @@ static CompositeDateTime toCompositeDateTime(Object other) {
             return toCompositeDateTime(((com.gs.dmn.runtime.DMNType)other).toContext());
         } else if (other instanceof proto.CompositeDateTime) {
             CompositeDateTimeImpl result_ = new CompositeDateTimeImpl();
-            result_.setDate(com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.date(((proto.CompositeDateTime) other).getDate()));
-            result_.setTime(com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.time(((proto.CompositeDateTime) other).getTime()));
-            result_.setDateTime(com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.dateAndTime(((proto.CompositeDateTime) other).getDateTime()));
-            result_.setYearMonthDuration(com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.duration(((proto.CompositeDateTime) other).getYearMonthDuration()));
-            result_.setDayTimeDuration(com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.duration(((proto.CompositeDateTime) other).getDayTimeDuration()));
+            result_.setDate(com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.date(((proto.CompositeDateTime) other).getDate()));
+            result_.setTime(com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.time(((proto.CompositeDateTime) other).getTime()));
+            result_.setDateTime(com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.dateAndTime(((proto.CompositeDateTime) other).getDateTime()));
+            result_.setYearMonthDuration(com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.duration(((proto.CompositeDateTime) other).getYearMonthDuration()));
+            result_.setDayTimeDuration(com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.duration(((proto.CompositeDateTime) other).getDayTimeDuration()));
             return result_;
         } else {
             throw new com.gs.dmn.runtime.DMNRuntimeException(String.format("Cannot convert '%s' to '%s'", other.getClass().getSimpleName(), CompositeDateTime.class.getSimpleName()));
@@ -57,15 +57,15 @@ static CompositeDateTime toCompositeDateTime(Object other) {
     static proto.CompositeDateTime toProto(CompositeDateTime other) {
         proto.CompositeDateTime.Builder result_ = proto.CompositeDateTime.newBuilder();
         if (other != null) {
-            String dateProto_ = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string(((CompositeDateTime) other).getDate());
+            String dateProto_ = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string(((CompositeDateTime) other).getDate());
             result_.setDate(dateProto_);
-            String timeProto_ = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string(((CompositeDateTime) other).getTime());
+            String timeProto_ = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string(((CompositeDateTime) other).getTime());
             result_.setTime(timeProto_);
-            String dateTimeProto_ = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string(((CompositeDateTime) other).getDateTime());
+            String dateTimeProto_ = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string(((CompositeDateTime) other).getDateTime());
             result_.setDateTime(dateTimeProto_);
-            String yearMonthDurationProto_ = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string(((CompositeDateTime) other).getYearMonthDuration());
+            String yearMonthDurationProto_ = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string(((CompositeDateTime) other).getYearMonthDuration());
             result_.setYearMonthDuration(yearMonthDurationProto_);
-            String dayTimeDurationProto_ = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string(((CompositeDateTime) other).getDayTimeDuration());
+            String dayTimeDurationProto_ = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string(((CompositeDateTime) other).getDayTimeDuration());
             result_.setDayTimeDuration(dayTimeDurationProto_);
         }
         return result_.build();
@@ -80,19 +80,19 @@ static List<proto.CompositeDateTime> toProto(List<CompositeDateTime> other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Date")
-    javax.xml.datatype.XMLGregorianCalendar getDate();
+    java.time.LocalDate getDate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Time")
-    javax.xml.datatype.XMLGregorianCalendar getTime();
+    java.time.temporal.TemporalAccessor getTime();
 
     @com.fasterxml.jackson.annotation.JsonGetter("DateTime")
-    javax.xml.datatype.XMLGregorianCalendar getDateTime();
+    java.time.temporal.TemporalAccessor getDateTime();
 
     @com.fasterxml.jackson.annotation.JsonGetter("YearMonthDuration")
-    javax.xml.datatype.Duration getYearMonthDuration();
+    java.time.temporal.TemporalAmount getYearMonthDuration();
 
     @com.fasterxml.jackson.annotation.JsonGetter("DayTimeDuration")
-    javax.xml.datatype.Duration getDayTimeDuration();
+    java.time.temporal.TemporalAmount getDayTimeDuration();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/type/CompositeDateTimeImpl.java b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/type/CompositeDateTimeImpl.java
index 1aecb9a08..9e106945b 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/type/CompositeDateTimeImpl.java
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/java/dmn/type/CompositeDateTimeImpl.java
@@ -5,16 +5,16 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "CompositeDateTime"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class CompositeDateTimeImpl implements CompositeDateTime {
-        private javax.xml.datatype.XMLGregorianCalendar date;
-        private javax.xml.datatype.XMLGregorianCalendar time;
-        private javax.xml.datatype.XMLGregorianCalendar dateTime;
-        private javax.xml.datatype.Duration yearMonthDuration;
-        private javax.xml.datatype.Duration dayTimeDuration;
+        private java.time.LocalDate date;
+        private java.time.temporal.TemporalAccessor time;
+        private java.time.temporal.TemporalAccessor dateTime;
+        private java.time.temporal.TemporalAmount yearMonthDuration;
+        private java.time.temporal.TemporalAmount dayTimeDuration;
 
     public CompositeDateTimeImpl() {
     }
 
-    public CompositeDateTimeImpl(javax.xml.datatype.XMLGregorianCalendar date, javax.xml.datatype.XMLGregorianCalendar dateTime, javax.xml.datatype.Duration dayTimeDuration, javax.xml.datatype.XMLGregorianCalendar time, javax.xml.datatype.Duration yearMonthDuration) {
+    public CompositeDateTimeImpl(java.time.LocalDate date, java.time.temporal.TemporalAccessor dateTime, java.time.temporal.TemporalAmount dayTimeDuration, java.time.temporal.TemporalAccessor time, java.time.temporal.TemporalAmount yearMonthDuration) {
         this.setDate(date);
         this.setDateTime(dateTime);
         this.setDayTimeDuration(dayTimeDuration);
@@ -23,52 +23,52 @@ public CompositeDateTimeImpl(javax.xml.datatype.XMLGregorianCalendar date, javax
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Date")
-    public javax.xml.datatype.XMLGregorianCalendar getDate() {
+    public java.time.LocalDate getDate() {
         return this.date;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Date")
-    public void setDate(javax.xml.datatype.XMLGregorianCalendar date) {
+    public void setDate(java.time.LocalDate date) {
         this.date = date;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("DateTime")
-    public javax.xml.datatype.XMLGregorianCalendar getDateTime() {
+    public java.time.temporal.TemporalAccessor getDateTime() {
         return this.dateTime;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("DateTime")
-    public void setDateTime(javax.xml.datatype.XMLGregorianCalendar dateTime) {
+    public void setDateTime(java.time.temporal.TemporalAccessor dateTime) {
         this.dateTime = dateTime;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("DayTimeDuration")
-    public javax.xml.datatype.Duration getDayTimeDuration() {
+    public java.time.temporal.TemporalAmount getDayTimeDuration() {
         return this.dayTimeDuration;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("DayTimeDuration")
-    public void setDayTimeDuration(javax.xml.datatype.Duration dayTimeDuration) {
+    public void setDayTimeDuration(java.time.temporal.TemporalAmount dayTimeDuration) {
         this.dayTimeDuration = dayTimeDuration;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Time")
-    public javax.xml.datatype.XMLGregorianCalendar getTime() {
+    public java.time.temporal.TemporalAccessor getTime() {
         return this.time;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Time")
-    public void setTime(javax.xml.datatype.XMLGregorianCalendar time) {
+    public void setTime(java.time.temporal.TemporalAccessor time) {
         this.time = time;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("YearMonthDuration")
-    public javax.xml.datatype.Duration getYearMonthDuration() {
+    public java.time.temporal.TemporalAmount getYearMonthDuration() {
         return this.yearMonthDuration;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("YearMonthDuration")
-    public void setYearMonthDuration(javax.xml.datatype.Duration yearMonthDuration) {
+    public void setYearMonthDuration(java.time.temporal.TemporalAmount yearMonthDuration) {
         this.yearMonthDuration = yearMonthDuration;
     }
 
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/CompositeDateTime.kt b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/CompositeDateTime.kt
index 0f5a56ad0..48833df38 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/CompositeDateTime.kt
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/CompositeDateTime.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class CompositeDateTime() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class CompositeDateTime() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): type.CompositeDateTime? {
         try {
             return apply(input_.get("CompositeInputDateTime")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.CompositeDateTimeImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/Date.kt b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/Date.kt
index ff8ad2d17..1e9015fee 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/Date.kt
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/Date.kt
@@ -12,8 +12,8 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Date() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
-    override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+class Date() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
+    override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.time.LocalDate? {
         try {
             return apply(input_.get("InputDate")?.let({ date(it) }), context_)
         } catch (e: Exception) {
@@ -22,7 +22,7 @@ class Date() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
     }
 
-    fun apply(inputDate: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+    fun apply(inputDate: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): java.time.LocalDate? {
         try {
             // Start decision 'Date'
             var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
@@ -35,7 +35,7 @@ class Date() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, dateArguments_)
 
             // Evaluate decision 'Date'
-            val output_: javax.xml.datatype.XMLGregorianCalendar? = evaluate(inputDate, context_)
+            val output_: java.time.LocalDate? = evaluate(inputDate, context_)
 
             // End decision 'Date'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, dateArguments_, output_, (System.currentTimeMillis() - dateStartTime_))
@@ -49,10 +49,10 @@ class Date() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
 
     fun applyProto(dateRequest_: proto.DateRequest, context_: com.gs.dmn.runtime.ExecutionContext): proto.DateResponse {
         // Create arguments from Request Message
-        val inputDate: javax.xml.datatype.XMLGregorianCalendar? = date(dateRequest_.getInputDate())
+        val inputDate: java.time.LocalDate? = date(dateRequest_.getInputDate())
 
         // Invoke apply method
-        val output_: javax.xml.datatype.XMLGregorianCalendar? = apply(inputDate, context_)
+        val output_: java.time.LocalDate? = apply(inputDate, context_)
 
         // Convert output to Response Message
         val builder_: proto.DateResponse.Builder = proto.DateResponse.newBuilder()
@@ -61,12 +61,12 @@ class Date() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         return builder_.build()
     }
 
-    private inline fun evaluate(inputDate: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+    private inline fun evaluate(inputDate: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): java.time.LocalDate? {
         var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
         var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener()
         var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor()
         var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache()
-        return inputDate as javax.xml.datatype.XMLGregorianCalendar?
+        return inputDate as java.time.LocalDate?
     }
 
     companion object {
@@ -83,7 +83,7 @@ class Date() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         @JvmStatic
         fun requestToMap(dateRequest_: proto.DateRequest): kotlin.collections.Map<String, Any?> {
             // Create arguments from Request Message
-            val inputDate: javax.xml.datatype.XMLGregorianCalendar? = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.date(dateRequest_.getInputDate())
+            val inputDate: java.time.LocalDate? = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.date(dateRequest_.getInputDate())
 
             // Create map
             val map_: kotlin.collections.MutableMap<String, Any?> = mutableMapOf()
@@ -92,9 +92,9 @@ class Date() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
 
         @JvmStatic
-        fun responseToOutput(dateResponse_: proto.DateResponse): javax.xml.datatype.XMLGregorianCalendar? {
+        fun responseToOutput(dateResponse_: proto.DateResponse): java.time.LocalDate? {
             // Extract and convert output
-            return com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.date(dateResponse_.getDate())
+            return com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.date(dateResponse_.getDate())
         }
     }
 }
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/DateTime.kt b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/DateTime.kt
index fa199d5b5..035436164 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/DateTime.kt
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/DateTime.kt
@@ -12,8 +12,8 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class DateTime() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
-    override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+class DateTime() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
+    override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.time.temporal.TemporalAccessor? {
         try {
             return apply(input_.get("InputDateTime")?.let({ dateAndTime(it) }), context_)
         } catch (e: Exception) {
@@ -22,7 +22,7 @@ class DateTime() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
     }
 
-    fun apply(inputDateTime: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+    fun apply(inputDateTime: java.time.temporal.TemporalAccessor?, context_: com.gs.dmn.runtime.ExecutionContext): java.time.temporal.TemporalAccessor? {
         try {
             // Start decision 'DateTime'
             var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
@@ -35,7 +35,7 @@ class DateTime() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, dateTimeArguments_)
 
             // Evaluate decision 'DateTime'
-            val output_: javax.xml.datatype.XMLGregorianCalendar? = evaluate(inputDateTime, context_)
+            val output_: java.time.temporal.TemporalAccessor? = evaluate(inputDateTime, context_)
 
             // End decision 'DateTime'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, dateTimeArguments_, output_, (System.currentTimeMillis() - dateTimeStartTime_))
@@ -49,10 +49,10 @@ class DateTime() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
 
     fun applyProto(dateTimeRequest_: proto.DateTimeRequest, context_: com.gs.dmn.runtime.ExecutionContext): proto.DateTimeResponse {
         // Create arguments from Request Message
-        val inputDateTime: javax.xml.datatype.XMLGregorianCalendar? = dateAndTime(dateTimeRequest_.getInputDateTime())
+        val inputDateTime: java.time.temporal.TemporalAccessor? = dateAndTime(dateTimeRequest_.getInputDateTime())
 
         // Invoke apply method
-        val output_: javax.xml.datatype.XMLGregorianCalendar? = apply(inputDateTime, context_)
+        val output_: java.time.temporal.TemporalAccessor? = apply(inputDateTime, context_)
 
         // Convert output to Response Message
         val builder_: proto.DateTimeResponse.Builder = proto.DateTimeResponse.newBuilder()
@@ -61,12 +61,12 @@ class DateTime() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         return builder_.build()
     }
 
-    private inline fun evaluate(inputDateTime: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+    private inline fun evaluate(inputDateTime: java.time.temporal.TemporalAccessor?, context_: com.gs.dmn.runtime.ExecutionContext): java.time.temporal.TemporalAccessor? {
         var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
         var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener()
         var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor()
         var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache()
-        return inputDateTime as javax.xml.datatype.XMLGregorianCalendar?
+        return inputDateTime as java.time.temporal.TemporalAccessor?
     }
 
     companion object {
@@ -83,7 +83,7 @@ class DateTime() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         @JvmStatic
         fun requestToMap(dateTimeRequest_: proto.DateTimeRequest): kotlin.collections.Map<String, Any?> {
             // Create arguments from Request Message
-            val inputDateTime: javax.xml.datatype.XMLGregorianCalendar? = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.dateAndTime(dateTimeRequest_.getInputDateTime())
+            val inputDateTime: java.time.temporal.TemporalAccessor? = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.dateAndTime(dateTimeRequest_.getInputDateTime())
 
             // Create map
             val map_: kotlin.collections.MutableMap<String, Any?> = mutableMapOf()
@@ -92,9 +92,9 @@ class DateTime() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
 
         @JvmStatic
-        fun responseToOutput(dateTimeResponse_: proto.DateTimeResponse): javax.xml.datatype.XMLGregorianCalendar? {
+        fun responseToOutput(dateTimeResponse_: proto.DateTimeResponse): java.time.temporal.TemporalAccessor? {
             // Extract and convert output
-            return com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.dateAndTime(dateTimeResponse_.getDateTime())
+            return com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.dateAndTime(dateTimeResponse_.getDateTime())
         }
     }
 }
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/Time.kt b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/Time.kt
index 0e419ba5d..925613623 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/Time.kt
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/Time.kt
@@ -12,8 +12,8 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Time() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
-    override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+class Time() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
+    override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.time.temporal.TemporalAccessor? {
         try {
             return apply(input_.get("InputTime")?.let({ time(it) }), context_)
         } catch (e: Exception) {
@@ -22,7 +22,7 @@ class Time() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
     }
 
-    fun apply(inputTime: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+    fun apply(inputTime: java.time.temporal.TemporalAccessor?, context_: com.gs.dmn.runtime.ExecutionContext): java.time.temporal.TemporalAccessor? {
         try {
             // Start decision 'Time'
             var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
@@ -35,7 +35,7 @@ class Time() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, timeArguments_)
 
             // Evaluate decision 'Time'
-            val output_: javax.xml.datatype.XMLGregorianCalendar? = evaluate(inputTime, context_)
+            val output_: java.time.temporal.TemporalAccessor? = evaluate(inputTime, context_)
 
             // End decision 'Time'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, timeArguments_, output_, (System.currentTimeMillis() - timeStartTime_))
@@ -49,10 +49,10 @@ class Time() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
 
     fun applyProto(timeRequest_: proto.TimeRequest, context_: com.gs.dmn.runtime.ExecutionContext): proto.TimeResponse {
         // Create arguments from Request Message
-        val inputTime: javax.xml.datatype.XMLGregorianCalendar? = time(timeRequest_.getInputTime())
+        val inputTime: java.time.temporal.TemporalAccessor? = time(timeRequest_.getInputTime())
 
         // Invoke apply method
-        val output_: javax.xml.datatype.XMLGregorianCalendar? = apply(inputTime, context_)
+        val output_: java.time.temporal.TemporalAccessor? = apply(inputTime, context_)
 
         // Convert output to Response Message
         val builder_: proto.TimeResponse.Builder = proto.TimeResponse.newBuilder()
@@ -61,12 +61,12 @@ class Time() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         return builder_.build()
     }
 
-    private inline fun evaluate(inputTime: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): javax.xml.datatype.XMLGregorianCalendar? {
+    private inline fun evaluate(inputTime: java.time.temporal.TemporalAccessor?, context_: com.gs.dmn.runtime.ExecutionContext): java.time.temporal.TemporalAccessor? {
         var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
         var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener()
         var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor()
         var cache_: com.gs.dmn.runtime.cache.Cache = context_.getCache()
-        return inputTime as javax.xml.datatype.XMLGregorianCalendar?
+        return inputTime as java.time.temporal.TemporalAccessor?
     }
 
     companion object {
@@ -83,7 +83,7 @@ class Time() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         @JvmStatic
         fun requestToMap(timeRequest_: proto.TimeRequest): kotlin.collections.Map<String, Any?> {
             // Create arguments from Request Message
-            val inputTime: javax.xml.datatype.XMLGregorianCalendar? = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.time(timeRequest_.getInputTime())
+            val inputTime: java.time.temporal.TemporalAccessor? = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.time(timeRequest_.getInputTime())
 
             // Create map
             val map_: kotlin.collections.MutableMap<String, Any?> = mutableMapOf()
@@ -92,9 +92,9 @@ class Time() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
 
         @JvmStatic
-        fun responseToOutput(timeResponse_: proto.TimeResponse): javax.xml.datatype.XMLGregorianCalendar? {
+        fun responseToOutput(timeResponse_: proto.TimeResponse): java.time.temporal.TemporalAccessor? {
             // Extract and convert output
-            return com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.time(timeResponse_.getTime())
+            return com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.time(timeResponse_.getTime())
         }
     }
 }
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/type/CompositeDateTime.kt b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/type/CompositeDateTime.kt
index c37b055e4..343683a2b 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/type/CompositeDateTime.kt
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/type/CompositeDateTime.kt
@@ -7,19 +7,19 @@ import java.util.*
 @com.fasterxml.jackson.databind.annotation.JsonDeserialize(`as` = type.CompositeDateTimeImpl::class)
 interface CompositeDateTime : com.gs.dmn.runtime.DMNType {
     @get:com.fasterxml.jackson.annotation.JsonGetter("Date")
-    val date: javax.xml.datatype.XMLGregorianCalendar?
+    val date: java.time.LocalDate?
 
     @get:com.fasterxml.jackson.annotation.JsonGetter("Time")
-    val time: javax.xml.datatype.XMLGregorianCalendar?
+    val time: java.time.temporal.TemporalAccessor?
 
     @get:com.fasterxml.jackson.annotation.JsonGetter("DateTime")
-    val dateTime: javax.xml.datatype.XMLGregorianCalendar?
+    val dateTime: java.time.temporal.TemporalAccessor?
 
     @get:com.fasterxml.jackson.annotation.JsonGetter("YearMonthDuration")
-    val yearMonthDuration: javax.xml.datatype.Duration?
+    val yearMonthDuration: java.time.temporal.TemporalAmount?
 
     @get:com.fasterxml.jackson.annotation.JsonGetter("DayTimeDuration")
-    val dayTimeDuration: javax.xml.datatype.Duration?
+    val dayTimeDuration: java.time.temporal.TemporalAmount?
 
     override fun toContext(): com.gs.dmn.runtime.Context {
         val context = com.gs.dmn.runtime.Context()
@@ -75,21 +75,21 @@ interface CompositeDateTime : com.gs.dmn.runtime.DMNType {
                 return other
             } else if (other is com.gs.dmn.runtime.Context) {
                 var result_ = CompositeDateTimeImpl()
-                result_.date = other.get("Date") as javax.xml.datatype.XMLGregorianCalendar?
-                result_.time = other.get("Time") as javax.xml.datatype.XMLGregorianCalendar?
-                result_.dateTime = other.get("DateTime") as javax.xml.datatype.XMLGregorianCalendar?
-                result_.yearMonthDuration = other.get("YearMonthDuration") as javax.xml.datatype.Duration?
-                result_.dayTimeDuration = other.get("DayTimeDuration") as javax.xml.datatype.Duration?
+                result_.date = other.get("Date") as java.time.LocalDate?
+                result_.time = other.get("Time") as java.time.temporal.TemporalAccessor?
+                result_.dateTime = other.get("DateTime") as java.time.temporal.TemporalAccessor?
+                result_.yearMonthDuration = other.get("YearMonthDuration") as java.time.temporal.TemporalAmount?
+                result_.dayTimeDuration = other.get("DayTimeDuration") as java.time.temporal.TemporalAmount?
                 return result_
             } else if (other is com.gs.dmn.runtime.DMNType) {
                 return toCompositeDateTime(other.toContext())
             } else if (other is proto.CompositeDateTime) {
                 var result_: CompositeDateTimeImpl = CompositeDateTimeImpl()
-                result_.date = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.date((other as proto.CompositeDateTime).getDate())
-                result_.time = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.time((other as proto.CompositeDateTime).getTime())
-                result_.dateTime = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.dateAndTime((other as proto.CompositeDateTime).getDateTime())
-                result_.yearMonthDuration = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.duration((other as proto.CompositeDateTime).getYearMonthDuration())
-                result_.dayTimeDuration = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.duration((other as proto.CompositeDateTime).getDayTimeDuration())
+                result_.date = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.date((other as proto.CompositeDateTime).getDate())
+                result_.time = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.time((other as proto.CompositeDateTime).getTime())
+                result_.dateTime = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.dateAndTime((other as proto.CompositeDateTime).getDateTime())
+                result_.yearMonthDuration = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.duration((other as proto.CompositeDateTime).getYearMonthDuration())
+                result_.dayTimeDuration = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.duration((other as proto.CompositeDateTime).getDayTimeDuration())
                 return result_
             } else {
                 throw com.gs.dmn.runtime.DMNRuntimeException(String.format("Cannot convert '%s' to '%s'", other.javaClass.getSimpleName(), CompositeDateTime::class.java.getSimpleName()))
@@ -100,15 +100,15 @@ interface CompositeDateTime : com.gs.dmn.runtime.DMNType {
         fun toProto(other: CompositeDateTime?): proto.CompositeDateTime {
             var result_: proto.CompositeDateTime.Builder = proto.CompositeDateTime.newBuilder()
             if (other != null) {
-                var dateProto_: String = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string((other as CompositeDateTime).date)
+                var dateProto_: String = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string((other as CompositeDateTime).date)
                 result_.setDate(dateProto_)
-                var timeProto_: String = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string((other as CompositeDateTime).time)
+                var timeProto_: String = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string((other as CompositeDateTime).time)
                 result_.setTime(timeProto_)
-                var dateTimeProto_: String = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string((other as CompositeDateTime).dateTime)
+                var dateTimeProto_: String = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string((other as CompositeDateTime).dateTime)
                 result_.setDateTime(dateTimeProto_)
-                var yearMonthDurationProto_: String = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string((other as CompositeDateTime).yearMonthDuration)
+                var yearMonthDurationProto_: String = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string((other as CompositeDateTime).yearMonthDuration)
                 result_.setYearMonthDuration(yearMonthDurationProto_)
-                var dayTimeDurationProto_: String = com.gs.dmn.feel.lib.DefaultFEELLib.INSTANCE.string((other as CompositeDateTime).dayTimeDuration)
+                var dayTimeDurationProto_: String = com.gs.dmn.feel.lib.JavaTimeFEELLib.INSTANCE.string((other as CompositeDateTime).dayTimeDuration)
                 result_.setDayTimeDuration(dayTimeDurationProto_)
             }
             return result_.build()
diff --git a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/type/CompositeDateTimeImpl.kt b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/type/CompositeDateTimeImpl.kt
index dc2aa759d..526fa6269 100644
--- a/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/type/CompositeDateTimeImpl.kt
+++ b/dmn-test-cases/standard/proto/1.1/date-time-proto/translator/expected/proto3/kotlin/dmn/type/CompositeDateTimeImpl.kt
@@ -7,28 +7,28 @@ import java.util.*
 class CompositeDateTimeImpl : CompositeDateTime {
     @get:com.fasterxml.jackson.annotation.JsonGetter("Date")
     @set:com.fasterxml.jackson.annotation.JsonGetter("Date")
-    override var date: javax.xml.datatype.XMLGregorianCalendar? = null
+    override var date: java.time.LocalDate? = null
 
     @get:com.fasterxml.jackson.annotation.JsonGetter("Time")
     @set:com.fasterxml.jackson.annotation.JsonGetter("Time")
-    override var time: javax.xml.datatype.XMLGregorianCalendar? = null
+    override var time: java.time.temporal.TemporalAccessor? = null
 
     @get:com.fasterxml.jackson.annotation.JsonGetter("DateTime")
     @set:com.fasterxml.jackson.annotation.JsonGetter("DateTime")
-    override var dateTime: javax.xml.datatype.XMLGregorianCalendar? = null
+    override var dateTime: java.time.temporal.TemporalAccessor? = null
 
     @get:com.fasterxml.jackson.annotation.JsonGetter("YearMonthDuration")
     @set:com.fasterxml.jackson.annotation.JsonGetter("YearMonthDuration")
-    override var yearMonthDuration: javax.xml.datatype.Duration? = null
+    override var yearMonthDuration: java.time.temporal.TemporalAmount? = null
 
     @get:com.fasterxml.jackson.annotation.JsonGetter("DayTimeDuration")
     @set:com.fasterxml.jackson.annotation.JsonGetter("DayTimeDuration")
-    override var dayTimeDuration: javax.xml.datatype.Duration? = null
+    override var dayTimeDuration: java.time.temporal.TemporalAmount? = null
 
     constructor() {
     }
 
-    constructor (date: javax.xml.datatype.XMLGregorianCalendar?, dateTime: javax.xml.datatype.XMLGregorianCalendar?, dayTimeDuration: javax.xml.datatype.Duration?, time: javax.xml.datatype.XMLGregorianCalendar?, yearMonthDuration: javax.xml.datatype.Duration?) {
+    constructor (date: java.time.LocalDate?, dateTime: java.time.temporal.TemporalAccessor?, dayTimeDuration: java.time.temporal.TemporalAmount?, time: java.time.temporal.TemporalAccessor?, yearMonthDuration: java.time.temporal.TemporalAmount?) {
         this.date = date
         this.dateTime = dateTime
         this.dayTimeDuration = dayTimeDuration
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ApprovalStatus.java b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ApprovalStatus.java
index eae55b5dc..fea9620be 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ApprovalStatus.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ApprovalStatus.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 4
 )
-public class ApprovalStatus extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApprovalStatus extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Approval Status",
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ApprovalStatus.kt b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ApprovalStatus.kt
index a85c773f4..ab9e2a17b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ApprovalStatus.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/kotlin/dmn/ApprovalStatus.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 4
 )
-class ApprovalStatus() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("RiskCategory"), input_.get("isAffordable")?.let({ it.toBoolean() }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ApprovalStatus.java b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ApprovalStatus.java
index 831308868..7ba8bbc15 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ApprovalStatus.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ApprovalStatus.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.ANY,
     rulesCount = 4
 )
-public class ApprovalStatus extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApprovalStatus extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Approval Status",
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ApprovalStatus.kt b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ApprovalStatus.kt
index 72adecf3d..02ec125d3 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ApprovalStatus.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/kotlin/dmn/ApprovalStatus.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.ANY,
     rulesCount = 4
 )
-class ApprovalStatus() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("RiskCategory"), input_.get("isAffordable")?.let({ it.toBoolean() }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ApprovalStatus.java b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ApprovalStatus.java
index 1509bf787..691e90429 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ApprovalStatus.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ApprovalStatus.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 4
 )
-public class ApprovalStatus extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApprovalStatus extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Approval Status",
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ApprovalStatus.kt b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ApprovalStatus.kt
index 3144e64cd..3b358ae85 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ApprovalStatus.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/kotlin/dmn/ApprovalStatus.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 4
 )
-class ApprovalStatus() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("RiskCategory"), input_.get("isAffordable")?.let({ it.toBoolean() }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ApprovalStatus.java b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ApprovalStatus.java
index aa9ae3e86..fa18bde71 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ApprovalStatus.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ApprovalStatus.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 2
 )
-public class ApprovalStatus extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApprovalStatus extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Approval Status",
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ApprovalStatus.kt b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ApprovalStatus.kt
index 0b2dc3d6b..32fa6e63d 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ApprovalStatus.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/kotlin/dmn/ApprovalStatus.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 2
 )
-class ApprovalStatus() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ApprovalStatus() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("RiskCategory"), input_.get("isAffordable")?.let({ it.toBoolean() }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/Payment.java b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/Payment.java
index f7a5be7a4..a62bc43a1 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/Payment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/Payment.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Payment extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Payment extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "payment",
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/Payment.kt b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/Payment.kt
index 89b1ceb73..cd3d4319c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/Payment.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/kotlin/dmn/Payment.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Payment() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Payment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("loan")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TLoanImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/MonthlyPayment.java b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/MonthlyPayment.java
index 8919c9970..31301dcd0 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/MonthlyPayment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/MonthlyPayment.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class MonthlyPayment extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class MonthlyPayment extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "MonthlyPayment",
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/PMT.java b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/PMT.java
index e6414e561..ad0d5dc39 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/PMT.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/PMT.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PMT extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PMT extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "PMT",
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/MonthlyPayment.kt b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/MonthlyPayment.kt
index b2d00a2c7..ddcdb9e67 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/MonthlyPayment.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/MonthlyPayment.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class MonthlyPayment() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("Loan")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TLoanImpl>() {}) }), input_.get("fee")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/PMT.kt b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/PMT.kt
index 5e153d66c..2e923b5b6 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/PMT.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/kotlin/dmn/PMT.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PMT : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/Approval.java b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/Approval.java
index 6441f28a1..fed8a6946 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/Approval.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/Approval.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 5
 )
-public class Approval extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Approval extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Approval",
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/Approval.kt b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/Approval.kt
index 6ba68f650..fe5ccfd8f 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/Approval.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/kotlin/dmn/Approval.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 5
 )
-class Approval() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Approval() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): type.TApproval? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("RiskCategory"), input_.get("isAffordable")?.let({ it.toBoolean() }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Adjudication.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Adjudication.java
index 09403bb51..d445a2de7 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Adjudication.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Adjudication.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Adjudication extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Adjudication extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Adjudication",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
index 03027851c..ca29b9ce4 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class AffordabilityCalculation extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class AffordabilityCalculation extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "AffordabilityCalculation",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
index bd32a0a31..0d47a1ed5 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class ApplicationRiskScore extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApplicationRiskScore extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "ApplicationRiskScore",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
index 5a842239f..71c3b7362 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 11
 )
-public class ApplicationRiskScoreModel extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApplicationRiskScoreModel extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "ApplicationRiskScoreModel",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/BureauCallType.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/BureauCallType.java
index 9c311372c..b07381dba 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/BureauCallType.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/BureauCallType.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class BureauCallType extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class BureauCallType extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "BureauCallType",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/BureauCallTypeTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/BureauCallTypeTable.java
index 10204a718..27dc06595 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/BureauCallTypeTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/BureauCallTypeTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class BureauCallTypeTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class BureauCallTypeTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "BureauCallTypeTable",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
index 27003568c..39988fd1e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class CreditContingencyFactorTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class CreditContingencyFactorTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "CreditContingencyFactorTable",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
index 6f5d5bbde..b72ec5a76 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Eligibility extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Eligibility extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Eligibility",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
index 2dc90706a..c186e78a1 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 4
 )
-public class EligibilityRules extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EligibilityRules extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "EligibilityRules",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
index 27bdbe45d..cd3e17db3 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class InstallmentCalculation extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class InstallmentCalculation extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "InstallmentCalculation",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
index af86d0103..95395d799 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PostBureauAffordability extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauAffordability extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauAffordability",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
index 41ba2c1fa..0386ca582 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PostBureauRiskCategory extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauRiskCategory extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauRiskCategory",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
index c0f933a6b..ec2e18c1c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 13
 )
-public class PostBureauRiskCategoryTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauRiskCategoryTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauRiskCategoryTable",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
index 58ddb77d3..916abd011 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PreBureauAffordability extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauAffordability extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauAffordability",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
index daebab831..a1ab90afe 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PreBureauRiskCategory extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauRiskCategory extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauRiskCategory",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
index c6430928c..5ce913feb 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 8
 )
-public class PreBureauRiskCategoryTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauRiskCategoryTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauRiskCategoryTable",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
index d2c9bd40b..f3d202996 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class RequiredMonthlyInstallment extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class RequiredMonthlyInstallment extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "RequiredMonthlyInstallment",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Routing.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Routing.java
index c7134db60..cfbf2b557 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Routing.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Routing.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Routing extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Routing extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Routing",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
index 39aef627e..787d9d796 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 5
 )
-public class RoutingRules extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class RoutingRules extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "RoutingRules",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Strategy.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Strategy.java
index 8f07bc5ac..b7f1900e6 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Strategy.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Strategy.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class Strategy extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Strategy extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Strategy",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Adjudication.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Adjudication.kt
index 436861b78..a94e25931 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Adjudication.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Adjudication.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Adjudication() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Adjudication() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("BureauData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TBureauDataImpl>() {}) }), input_.get("SupportingDocuments"), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/AffordabilityCalculation.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/AffordabilityCalculation.kt
index fb08d44da..aef99ea20 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/AffordabilityCalculation.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/AffordabilityCalculation.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class AffordabilityCalculation : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class AffordabilityCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScore.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScore.kt
index c9363f472..2718d9c17 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScore.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScore.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class ApplicationRiskScore() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ApplicationRiskScore() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModel.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModel.kt
index 6b3ebe282..3bf373bde 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModel.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/ApplicationRiskScoreModel.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 11
 )
-class ApplicationRiskScoreModel : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class ApplicationRiskScoreModel : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/BureauCallType.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/BureauCallType.kt
index 8e1d41933..c5dda676b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/BureauCallType.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/BureauCallType.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class BureauCallType(val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class BureauCallType(val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/BureauCallTypeTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/BureauCallTypeTable.kt
index e3bbf1915..cac9cd53f 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/BureauCallTypeTable.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/BureauCallTypeTable.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-class BureauCallTypeTable : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class BureauCallTypeTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTable.kt
index b9065ebd1..ea3d684eb 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTable.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/CreditContingencyFactorTable.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-class CreditContingencyFactorTable : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class CreditContingencyFactorTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Eligibility.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Eligibility.kt
index c733f041d..a702433e0 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Eligibility.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Eligibility.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Eligibility(val preBureauAffordability : PreBureauAffordability = PreBureauAffordability(), val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Eligibility(val preBureauAffordability : PreBureauAffordability = PreBureauAffordability(), val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/EligibilityRules.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/EligibilityRules.kt
index cabc462e8..4a64bf750 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/EligibilityRules.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/EligibilityRules.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 4
 )
-class EligibilityRules : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class EligibilityRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/InstallmentCalculation.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/InstallmentCalculation.kt
index 793888169..30ff80528 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/InstallmentCalculation.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/InstallmentCalculation.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class InstallmentCalculation : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class InstallmentCalculation : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauAffordability.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauAffordability.kt
index 7e545194c..92ac8d763 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauAffordability.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauAffordability.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PostBureauAffordability(val postBureauRiskCategory : PostBureauRiskCategory = PostBureauRiskCategory(), val requiredMonthlyInstallment : RequiredMonthlyInstallment = RequiredMonthlyInstallment()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PostBureauAffordability(val postBureauRiskCategory : PostBureauRiskCategory = PostBureauRiskCategory(), val requiredMonthlyInstallment : RequiredMonthlyInstallment = RequiredMonthlyInstallment()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("BureauData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TBureauDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategory.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategory.kt
index b65a1966b..5cc344dd7 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategory.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategory.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PostBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = ApplicationRiskScore()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PostBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = ApplicationRiskScore()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("BureauData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TBureauDataImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategoryTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategoryTable.kt
index 94a2bfa65..84acae432 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategoryTable.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PostBureauRiskCategoryTable.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 13
 )
-class PostBureauRiskCategoryTable : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class PostBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauAffordability.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauAffordability.kt
index 297efd589..144e62de2 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauAffordability.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauAffordability.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PreBureauAffordability(val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory(), val requiredMonthlyInstallment : RequiredMonthlyInstallment = RequiredMonthlyInstallment()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PreBureauAffordability(val preBureauRiskCategory : PreBureauRiskCategory = PreBureauRiskCategory(), val requiredMonthlyInstallment : RequiredMonthlyInstallment = RequiredMonthlyInstallment()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategory.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategory.kt
index 97226df30..e8a88e403 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategory.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategory.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PreBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = ApplicationRiskScore()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PreBureauRiskCategory(val applicationRiskScore : ApplicationRiskScore = ApplicationRiskScore()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategoryTable.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategoryTable.kt
index f6e9deff1..2df306611 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategoryTable.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/PreBureauRiskCategoryTable.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 8
 )
-class PreBureauRiskCategoryTable : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class PreBureauRiskCategoryTable : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RequiredMonthlyInstallment.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RequiredMonthlyInstallment.kt
index 4f7b79a9e..9475d1c23 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RequiredMonthlyInstallment.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RequiredMonthlyInstallment.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class RequiredMonthlyInstallment() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class RequiredMonthlyInstallment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Routing.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Routing.kt
index 7a3b71971..66b0e95e5 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Routing.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Routing.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Routing(val postBureauAffordability : PostBureauAffordability = PostBureauAffordability(), val postBureauRiskCategory : PostBureauRiskCategory = PostBureauRiskCategory()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Routing(val postBureauAffordability : PostBureauAffordability = PostBureauAffordability(), val postBureauRiskCategory : PostBureauRiskCategory = PostBureauRiskCategory()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("BureauData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TBureauDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RoutingRules.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RoutingRules.kt
index e7b7273f6..d33e1b267 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RoutingRules.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/RoutingRules.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 5
 )
-class RoutingRules : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class RoutingRules : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Strategy.kt b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Strategy.kt
index 26a889a00..638359aa9 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Strategy.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/kotlin/dmn/Strategy.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-class Strategy(val bureauCallType : BureauCallType = BureauCallType(), val eligibility : Eligibility = Eligibility()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Strategy(val bureauCallType : BureauCallType = BureauCallType(), val eligibility : Eligibility = Eligibility()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("ApplicantData")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) }), input_.get("RequestedProduct")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/MonthlyPayment.java b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/MonthlyPayment.java
index 8919c9970..31301dcd0 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/MonthlyPayment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/MonthlyPayment.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class MonthlyPayment extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class MonthlyPayment extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "MonthlyPayment",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/PMT.java b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/PMT.java
index e6414e561..ad0d5dc39 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/PMT.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/PMT.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PMT extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PMT extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "PMT",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/MonthlyPayment.kt b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/MonthlyPayment.kt
index b2d00a2c7..ddcdb9e67 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/MonthlyPayment.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/MonthlyPayment.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class MonthlyPayment() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class MonthlyPayment() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("Loan")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TLoanImpl>() {}) }), input_.get("fee")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/PMT.kt b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/PMT.kt
index 5e153d66c..2e923b5b6 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/PMT.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/kotlin/dmn/PMT.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PMT : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class PMT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/Join.java b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/Join.java
index ac3fc6d11..4b209b5ca 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/Join.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/Join.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Join extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Join extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Join",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/Join.kt b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/Join.kt
index 240230c90..f6e755b61 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/Join.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/kotlin/dmn/Join.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Join() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Join() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("DeptTable")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<type.TDeptTable?>?>() {}) }), input_.get("EmployeeTable")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<type.TEmployeeTable?>?>() {}) }), input_.get("LastName"), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort1.java b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort1.java
index c4306d745..4a15efd0a 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Sort1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Sort1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "sort1",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort2.java b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort2.java
index fcd63f494..97d88b2a8 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Sort2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Sort2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "sort2",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort3.java b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort3.java
index 6bccd8a62..efc0cd6c8 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort3.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Sort3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Sort3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "sort3",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort1.kt
index 5e916896f..eb5d24362 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort1.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort1.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Sort1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Sort1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): List<java.math.BigDecimal?>? {
         try {
             return apply(input_.get("listA")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<java.math.BigDecimal?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort2.kt
index 224ea9ee3..fa5d39b84 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort2.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort2.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Sort2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Sort2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): List<type.TRow?>? {
         try {
             return apply(input_.get("tableB")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<type.TRow?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort3.kt b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort3.kt
index 633b5c66a..9027d5518 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort3.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/kotlin/dmn/Sort3.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Sort3() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Sort3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): List<String?>? {
         try {
             return apply(input_.get("stringList")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<String?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Bankrates.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Bankrates.java
index f20908154..e54a03296 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Bankrates.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Bankrates.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bankrates extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bankrates extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Bankrates",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Equity36Mo.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Equity36Mo.java
index b2bfdf74b..ec22cd02a 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Equity36Mo.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Equity36Mo.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Equity36Mo extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Equity36Mo extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "equity36Mo",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/FinancialMetrics.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/FinancialMetrics.java
index c5b0ce026..1c938532c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/FinancialMetrics.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/FinancialMetrics.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class FinancialMetrics extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class FinancialMetrics extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "FinancialMetrics",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/MonthlyPayment.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/MonthlyPayment.java
index 621ee4bc7..5ce236a27 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/MonthlyPayment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/MonthlyPayment.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class MonthlyPayment extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class MonthlyPayment extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "monthlyPayment",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/RankedProducts.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/RankedProducts.java
index 46230350c..460e388d0 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/RankedProducts.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/RankedProducts.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class RankedProducts extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class RankedProducts extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "RankedProducts",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Bankrates.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Bankrates.kt
index 2b4b8ca0c..49f831e06 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Bankrates.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Bankrates.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Bankrates() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Bankrates() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): List<type.TLoanProduct?>? {
         try {
             return apply(context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Equity36Mo.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Equity36Mo.kt
index 8f5de60f9..36b2e3221 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Equity36Mo.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/Equity36Mo.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Equity36Mo : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class Equity36Mo : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/FinancialMetrics.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/FinancialMetrics.kt
index 6cd138991..d983d8bd7 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/FinancialMetrics.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/FinancialMetrics.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class FinancialMetrics : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class FinancialMetrics : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): type.TMetric? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/MonthlyPayment.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/MonthlyPayment.kt
index fb359604a..14210ad22 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/MonthlyPayment.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/MonthlyPayment.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class MonthlyPayment : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class MonthlyPayment : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/RankedProducts.kt b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/RankedProducts.kt
index 7381233d2..bdca92876 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/RankedProducts.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/kotlin/dmn/RankedProducts.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class RankedProducts(val bankrates : Bankrates = Bankrates()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class RankedProducts(val bankrates : Bankrates = Bankrates()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): type.TRankedProducts? {
         try {
             return apply(input_.get("RequestedAmt")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen1.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen1.java
index f38f30567..6479accab 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EveryGtTen1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EveryGtTen1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "everyGtTen1",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen2.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen2.java
index a0decf1d8..9302f80cb 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EveryGtTen2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EveryGtTen2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "everyGtTen2",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen3.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen3.java
index acc229151..926b9c708 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen3.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class EveryGtTen3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EveryGtTen3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "everyGtTen3",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/GtTen.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/GtTen.java
index 0576d323b..9751bc5a6 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/GtTen.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/GtTen.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class GtTen extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class GtTen extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "gtTen",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/PriceTable1.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/PriceTable1.java
index 0f00c8f71..f55d69f65 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/PriceTable1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/PriceTable1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PriceTable1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PriceTable1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "priceTable1",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen1.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen1.java
index 7b2a16608..442d1c48b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class SomeGtTen1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class SomeGtTen1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "someGtTen1",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen2.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen2.java
index e5d2ce114..885cb1dab 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class SomeGtTen2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class SomeGtTen2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "someGtTen2",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen1.kt
index 75767f39a..29226b80e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen1.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen1.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class EveryGtTen1(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class EveryGtTen1(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen2.kt
index 97a540e82..37d1ffc60 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen2.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen2.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class EveryGtTen2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class EveryGtTen2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("priceTable2")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<type.TItemPrice?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen3.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen3.kt
index 58719e47b..a3307a582 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen3.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/EveryGtTen3.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class EveryGtTen3(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class EveryGtTen3(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/GtTen.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/GtTen.kt
index c53611867..37a449d5d 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/GtTen.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/GtTen.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class GtTen : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class GtTen : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/PriceTable1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/PriceTable1.kt
index 4c8cb6891..a545375b4 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/PriceTable1.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/PriceTable1.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class PriceTable1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PriceTable1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): List<type.TItemPrice?>? {
         try {
             return apply(context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen1.kt
index ecdd5cac0..c352eeda0 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen1.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen1.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class SomeGtTen1(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class SomeGtTen1(val priceTable1 : PriceTable1 = PriceTable1()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen2.kt
index 7d6968e7d..54b966ae4 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen2.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/kotlin/dmn/SomeGtTen2.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class SomeGtTen2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class SomeGtTen2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("priceTable2")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<type.TItemPrice?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/DateCompare1.java b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/DateCompare1.java
index 873f3fc21..b138385bc 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/DateCompare1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/DateCompare1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class DateCompare1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DateCompare1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "dateCompare1",
@@ -36,7 +36,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(javax.xml.datatype.XMLGregorianCalendar dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.time.LocalDate dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'dateCompare1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -64,7 +64,7 @@ public Boolean apply(javax.xml.datatype.XMLGregorianCalendar dateD, com.gs.dmn.r
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar dateD = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
+                java.time.LocalDate dateD = 0 < args_.length ? (java.time.LocalDate) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -91,7 +91,7 @@ public Boolean apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalendar dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.time.LocalDate dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -122,7 +122,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalend
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(javax.xml.datatype.XMLGregorianCalendar dateD, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.time.LocalDate dateD, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/DateCompare2.java b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/DateCompare2.java
index b979282a6..6eac5054c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/DateCompare2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/DateCompare2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class DateCompare2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DateCompare2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "dateCompare2",
@@ -36,7 +36,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(javax.xml.datatype.XMLGregorianCalendar dateD, javax.xml.datatype.XMLGregorianCalendar dateE, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.time.LocalDate dateD, java.time.LocalDate dateE, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'dateCompare2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -65,8 +65,8 @@ public Boolean apply(javax.xml.datatype.XMLGregorianCalendar dateD, javax.xml.da
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                javax.xml.datatype.XMLGregorianCalendar dateD = 0 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[0] : null;
-                javax.xml.datatype.XMLGregorianCalendar dateE = 1 < args_.length ? (javax.xml.datatype.XMLGregorianCalendar) args_[1] : null;
+                java.time.LocalDate dateD = 0 < args_.length ? (java.time.LocalDate) args_[0] : null;
+                java.time.LocalDate dateE = 1 < args_.length ? (java.time.LocalDate) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -93,7 +93,7 @@ public Boolean apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalendar dateD, javax.xml.datatype.XMLGregorianCalendar dateE, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.time.LocalDate dateD, java.time.LocalDate dateE, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -124,7 +124,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(javax.xml.datatype.XMLGregorianCalend
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(javax.xml.datatype.XMLGregorianCalendar dateD, javax.xml.datatype.XMLGregorianCalendar dateE, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.time.LocalDate dateD, java.time.LocalDate dateE, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceGt10.java b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceGt10.java
index 563741b88..412017eaa 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceGt10.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceGt10.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-public class PriceGt10 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PriceGt10 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "priceGt10",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceInRange.java b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceInRange.java
index a63e1e08a..703cfcb69 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceInRange.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceInRange.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 2
 )
-public class PriceInRange extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PriceInRange extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "priceInRange",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DateCompare1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DateCompare1.kt
index 1dc32cd1e..5029fa651 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DateCompare1.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DateCompare1.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-class DateCompare1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class DateCompare1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("dateD")?.let({ date(it) }), context_)
@@ -22,7 +22,7 @@ class DateCompare1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
     }
 
-    fun apply(dateD: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
+    fun apply(dateD: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             // Start decision 'dateCompare1'
             var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
@@ -47,7 +47,7 @@ class DateCompare1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
     }
 
-    private inline fun evaluate(dateD: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
+    private inline fun evaluate(dateD: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
         var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener()
         var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor()
@@ -71,7 +71,7 @@ class DateCompare1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    private fun rule0(dateD: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput {
+    private fun rule0(dateD: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput {
         // Rule metadata
         val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "")
 
@@ -102,7 +102,7 @@ class DateCompare1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    private fun rule1(dateD: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput {
+    private fun rule1(dateD: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput {
         // Rule metadata
         val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "")
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DateCompare2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DateCompare2.kt
index 132c2b004..e71eeaa82 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DateCompare2.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/DateCompare2.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-class DateCompare2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class DateCompare2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("dateD")?.let({ date(it) }), input_.get("dateE")?.let({ date(it) }), context_)
@@ -22,7 +22,7 @@ class DateCompare2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
     }
 
-    fun apply(dateD: javax.xml.datatype.XMLGregorianCalendar?, dateE: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
+    fun apply(dateD: java.time.LocalDate?, dateE: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             // Start decision 'dateCompare2'
             var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
@@ -48,7 +48,7 @@ class DateCompare2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
         }
     }
 
-    private inline fun evaluate(dateD: javax.xml.datatype.XMLGregorianCalendar?, dateE: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
+    private inline fun evaluate(dateD: java.time.LocalDate?, dateE: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         var annotationSet_: com.gs.dmn.runtime.annotation.AnnotationSet = context_.getAnnotations()
         var eventListener_: com.gs.dmn.runtime.listener.EventListener = context_.getEventListener()
         var externalExecutor_: com.gs.dmn.runtime.external.ExternalFunctionExecutor = context_.getExternalFunctionExecutor()
@@ -72,7 +72,7 @@ class DateCompare2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    private fun rule0(dateD: javax.xml.datatype.XMLGregorianCalendar?, dateE: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput {
+    private fun rule0(dateD: java.time.LocalDate?, dateE: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput {
         // Rule metadata
         val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(0, "")
 
@@ -103,7 +103,7 @@ class DateCompare2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    private fun rule1(dateD: javax.xml.datatype.XMLGregorianCalendar?, dateE: javax.xml.datatype.XMLGregorianCalendar?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput {
+    private fun rule1(dateD: java.time.LocalDate?, dateE: java.time.LocalDate?, context_: com.gs.dmn.runtime.ExecutionContext): com.gs.dmn.runtime.RuleOutput {
         // Rule metadata
         val drgRuleMetadata: com.gs.dmn.runtime.listener.Rule = com.gs.dmn.runtime.listener.Rule(1, "")
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceGt10.kt b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceGt10.kt
index c06c98f86..7bd5fd446 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceGt10.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceGt10.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 2
 )
-class PriceGt10() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PriceGt10() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): Boolean? {
         try {
             return apply(input_.get("structA")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TAImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceInRange.kt b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceInRange.kt
index 708a30dae..135ef7bc7 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceInRange.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/kotlin/dmn/PriceInRange.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 2
 )
-class PriceInRange() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class PriceInRange() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("numB")?.let({ number(it) }), input_.get("numC")?.let({ number(it) }), input_.get("structA")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<type.TAImpl>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/BaseVacationDays.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/BaseVacationDays.java
index 8a48f69be..da98d1333 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/BaseVacationDays.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/BaseVacationDays.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class BaseVacationDays extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class BaseVacationDays extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Base Vacation Days",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1.java
index ff2d81908..a05e276f0 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-public class ExtraDaysCase1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ExtraDaysCase1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Extra days case 1",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2.java
index 9dae94417..087866d79 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-public class ExtraDaysCase2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ExtraDaysCase2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Extra days case 2",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3.java
index 23e5868d3..ef52b5b27 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-public class ExtraDaysCase3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ExtraDaysCase3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Extra days case 3",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/TotalVacationDays.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/TotalVacationDays.java
index 29b12f021..911bbaa57 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/TotalVacationDays.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/TotalVacationDays.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class TotalVacationDays extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class TotalVacationDays extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Total Vacation Days",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/BaseVacationDays.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/BaseVacationDays.kt
index 8bdb2ba62..a36dc1693 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/BaseVacationDays.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/BaseVacationDays.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class BaseVacationDays() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class BaseVacationDays() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1.kt
index 045223781..cecc05124 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase1.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-class ExtraDaysCase1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ExtraDaysCase1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("Years of Service")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2.kt
index 500c111f4..0fad79804 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase2.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-class ExtraDaysCase2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ExtraDaysCase2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("Years of Service")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3.kt
index 53b988e75..f4a1c6f81 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/ExtraDaysCase3.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-class ExtraDaysCase3() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class ExtraDaysCase3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("Years of Service")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/TotalVacationDays.kt b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/TotalVacationDays.kt
index 90918c78c..e3352323f 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/TotalVacationDays.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/kotlin/dmn/TotalVacationDays.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class TotalVacationDays(val baseVacationDays : BaseVacationDays = BaseVacationDays(), val extraDaysCase1 : ExtraDaysCase1 = ExtraDaysCase1(), val extraDaysCase2 : ExtraDaysCase2 = ExtraDaysCase2(), val extraDaysCase3 : ExtraDaysCase3 = ExtraDaysCase3()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class TotalVacationDays(val baseVacationDays : BaseVacationDays = BaseVacationDays(), val extraDaysCase1 : ExtraDaysCase1 = ExtraDaysCase1(), val extraDaysCase2 : ExtraDaysCase2 = ExtraDaysCase2(), val extraDaysCase3 : ExtraDaysCase3 = ExtraDaysCase3()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("Age")?.let({ number(it) }), input_.get("Years of Service")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision1.java b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision1.java
index 1e5b9c82d..065a9978b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision1",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision2.java b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision2.java
index 75e5d3852..a115a9770 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision2",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision3.java b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision3.java
index 92d565f11..555e9f316 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision3.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision3",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision4.java b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision4.java
index 712577140..f6c3d9b89 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision4.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision4.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision4 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision4 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision4",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision5.java b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision5.java
index aba46bd5b..31aaf466e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision5.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/java/dmn/Decision5.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision5 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision5 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision5",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision1.kt b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision1.kt
index 398b57576..a0da43a10 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision1.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision1.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Decision1() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Decision1() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): List<String?>? {
         try {
             return apply(input_.get("Employees")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<String?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision2.kt b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision2.kt
index 500671afc..f0c8f64a6 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision2.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision2.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Decision2() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Decision2() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("Employees")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<String?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision3.kt b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision3.kt
index f7863592b..7ab1a3f9f 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision3.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision3.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Decision3() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Decision3() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): List<String?>? {
         try {
             return apply(input_.get("Employees")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<String?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision4.kt b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision4.kt
index 367381acc..a7af8a16b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision4.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision4.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Decision4() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Decision4() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("Employees")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<String?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision5.kt b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision5.kt
index dd51d05a6..b52e300c1 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision5.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0021-singleton-list/translator/expected/kotlin/dmn/Decision5.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Decision5() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Decision5() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("Employees")?.let({ com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(it, object : com.fasterxml.jackson.core.type.TypeReference<List<String?>?>() {}) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/java/dmn/NamedFunctionInvocation.java b/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/java/dmn/NamedFunctionInvocation.java
index f1e380e0b..c36a03051 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/java/dmn/NamedFunctionInvocation.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/java/dmn/NamedFunctionInvocation.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class NamedFunctionInvocation extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class NamedFunctionInvocation extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "named function invocation",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/java/dmn/SimpleFunctionInvocation.java b/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/java/dmn/SimpleFunctionInvocation.java
index 60b2beef1..32be9e99f 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/java/dmn/SimpleFunctionInvocation.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/java/dmn/SimpleFunctionInvocation.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class SimpleFunctionInvocation extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class SimpleFunctionInvocation extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "simple function invocation",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/kotlin/dmn/NamedFunctionInvocation.kt b/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/kotlin/dmn/NamedFunctionInvocation.kt
index 97d006dc3..8cb3ac010 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/kotlin/dmn/NamedFunctionInvocation.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/kotlin/dmn/NamedFunctionInvocation.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class NamedFunctionInvocation() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class NamedFunctionInvocation() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("stringInputA"), input_.get("stringInputB"), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/kotlin/dmn/SimpleFunctionInvocation.kt b/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/kotlin/dmn/SimpleFunctionInvocation.kt
index 1663147b7..7c5902a04 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/kotlin/dmn/SimpleFunctionInvocation.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0030-user-defined-functions/translator/expected/kotlin/dmn/SimpleFunctionInvocation.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class SimpleFunctionInvocation() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class SimpleFunctionInvocation() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): String? {
         try {
             return apply(input_.get("stringInputA"), input_.get("stringInputB"), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/Circumference.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/Circumference.java
index 2547e340d..697399ecd 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/Circumference.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/Circumference.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Circumference extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Circumference extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Circumference",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationComplexParameters.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationComplexParameters.java
index 2a69cc7ca..1b90dd625 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationComplexParameters.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationComplexParameters.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class FnInvocationComplexParameters extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class FnInvocationComplexParameters extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "fn invocation complex parameters",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationNamedParameters.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationNamedParameters.java
index 73f1ecb5f..231186320 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationNamedParameters.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationNamedParameters.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class FnInvocationNamedParameters extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class FnInvocationNamedParameters extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "fn invocation named parameters",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationPositionalParameters.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationPositionalParameters.java
index b85d52f30..987622c7c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationPositionalParameters.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationPositionalParameters.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class FnInvocationPositionalParameters extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class FnInvocationPositionalParameters extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "fn invocation positional parameters",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnLibrary.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnLibrary.java
index c7f7e6e1a..64f811882 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnLibrary.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnLibrary.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class FnLibrary extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class FnLibrary extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "fn library",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/Circumference.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/Circumference.kt
index ed597985b..e195413c8 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/Circumference.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/Circumference.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Circumference : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class Circumference : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationComplexParameters.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationComplexParameters.kt
index 3b1b33efa..4079d179d 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationComplexParameters.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationComplexParameters.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class FnInvocationComplexParameters(val fnLibrary : FnLibrary = FnLibrary()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class FnInvocationComplexParameters(val fnLibrary : FnLibrary = FnLibrary()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationComplexParamsResult? {
         try {
             return apply(input_.get("inputA")?.let({ number(it) }), input_.get("inputB")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationNamedParameters.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationNamedParameters.kt
index c8df9ab73..d85c8329b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationNamedParameters.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationNamedParameters.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class FnInvocationNamedParameters(val fnLibrary : FnLibrary = FnLibrary()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class FnInvocationNamedParameters(val fnLibrary : FnLibrary = FnLibrary()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationNamedResult? {
         try {
             return apply(input_.get("inputA")?.let({ number(it) }), input_.get("inputB")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationPositionalParameters.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationPositionalParameters.kt
index 94f34df1b..ed965cb43 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationPositionalParameters.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnInvocationPositionalParameters.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class FnInvocationPositionalParameters(val fnLibrary : FnLibrary = FnLibrary()) : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class FnInvocationPositionalParameters(val fnLibrary : FnLibrary = FnLibrary()) : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnInvocationPositionalResult? {
         try {
             return apply(input_.get("inputA")?.let({ number(it) }), input_.get("inputB")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnLibrary.kt b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnLibrary.kt
index 1b850ce1c..58155b441 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnLibrary.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/kotlin/dmn/FnLibrary.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class FnLibrary() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class FnLibrary() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): type.TFnLibrary? {
         try {
             return apply(context_)
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/FACT.java b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/FACT.java
index 68054b524..16c27cf4a 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/FACT.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/FACT.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class FACT extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class FACT extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "FACT",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/Main.java b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/Main.java
index a1d4faf3b..7cc0b27a6 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/Main.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/Main.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Main extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Main extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "main",
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/FACT.kt b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/FACT.kt
index ad89972a7..30aeda4f5 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/FACT.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/FACT.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class FACT : com.gs.dmn.runtime.DefaultDMNBaseDecision {
+class FACT : com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     private constructor() {}
 
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/Main.kt b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/Main.kt
index c4c87af0f..dfd730351 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/Main.kt
+++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/kotlin/dmn/Main.kt
@@ -12,7 +12,7 @@ import java.util.stream.Collectors
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-class Main() : com.gs.dmn.runtime.DefaultDMNBaseDecision() {
+class Main() : com.gs.dmn.runtime.JavaTimeDMNBaseDecision() {
     override fun applyMap(input_: MutableMap<String, String>, context_: com.gs.dmn.runtime.ExecutionContext): java.math.BigDecimal? {
         try {
             return apply(input_.get("n")?.let({ number(it) }), context_)
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Applicant_repository.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Applicant_repository.java
index 5ec4ab2b5..d8d630ea6 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Applicant_repository.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Applicant_repository.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Applicant_repository extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Applicant_repository extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "applicant_repository",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Boxed_001.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Boxed_001.java
index 708634e80..6bdaadfaf 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Boxed_001.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Boxed_001.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Boxed_001 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Boxed_001 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "boxed_001",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_001.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_001.java
index b6d8672de..9fe799306 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_001.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_001.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Incorrect_001 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Incorrect_001 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "incorrect_001",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_002.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_002.java
index 91aeb800b..5ff3883f2 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_002.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_002.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Incorrect_002 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Incorrect_002 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "incorrect_002",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_003.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_003.java
index a63e0658d..f27d819ea 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_003.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_003.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Incorrect_003 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Incorrect_003 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "incorrect_003",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_001.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_001.java
index c8cda84ce..aa7e22c8a 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_001.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_001.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_001 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_001 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_001",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_002.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_002.java
index edb03ce51..7053c1c9e 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_002.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_002.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_002 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_002 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_002",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_003.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_003.java
index c9d8f03cc..f1c487455 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_003.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_003.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_003 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_003 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_003",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_004.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_004.java
index 9a98982f2..7af0d4671 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_004.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_004.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_004 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_004 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_004",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_005.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_005.java
index 09d1ff8b6..8edba02a5 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_005.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_005.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_005 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_005 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_005",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_006.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_006.java
index 2dd884a6d..8b8956d71 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_006.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_006.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_006 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_006 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_006",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_007.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_007.java
index ecce0e10a..df4de7444 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_007.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_007.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_007 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_007 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_007",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_007_a.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_007_a.java
index 0d0c72939..6dd878744 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_007_a.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_007_a.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_007_a extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_007_a extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_007_a",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_008.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_008.java
index 60fe00a4d..a8d30f21d 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_008.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_008.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_008 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_008 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_008",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_009.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_009.java
index adc9f5ce9..4abf25e8a 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_009.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_009.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_009 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_009 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_009",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_010.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_010.java
index 19f04a446..284cc13f3 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_010.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_010.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_010 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_010 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_010",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_011.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_011.java
index bb8f9692c..c8b720f7b 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_011.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_011.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_011 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_011 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_011",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_012.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_012.java
index 28b601da5..7dfbd2862 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_012.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_012.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Literal_012 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Literal_012 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "literal_012",
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Varargs_001.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Varargs_001.java
index ebacbe4b5..d265dc4be 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Varargs_001.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Varargs_001.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Varargs_001 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Varargs_001 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "varargs_001",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Adjudication.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Adjudication.java
index da05aa5eb..8d8a34048 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Adjudication.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Adjudication.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Adjudication extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Adjudication extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Adjudication",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
index 03027851c..ca29b9ce4 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class AffordabilityCalculation extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class AffordabilityCalculation extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "AffordabilityCalculation",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
index 4fa8c904b..9d5c7e0f6 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class ApplicationRiskScore extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApplicationRiskScore extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "ApplicationRiskScore",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
index 5a842239f..71c3b7362 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 11
 )
-public class ApplicationRiskScoreModel extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ApplicationRiskScoreModel extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "ApplicationRiskScoreModel",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/BureauCallType.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/BureauCallType.java
index c0f44784e..1d8a23fb5 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/BureauCallType.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/BureauCallType.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class BureauCallType extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class BureauCallType extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "BureauCallType",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/BureauCallTypeTable.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/BureauCallTypeTable.java
index 10204a718..27dc06595 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/BureauCallTypeTable.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/BureauCallTypeTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class BureauCallTypeTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class BureauCallTypeTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "BureauCallTypeTable",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
index 27003568c..39988fd1e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class CreditContingencyFactorTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class CreditContingencyFactorTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "CreditContingencyFactorTable",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
index 9f8bbb269..2ec220f2a 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Eligibility extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Eligibility extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Eligibility",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
index 2dc90706a..c186e78a1 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 4
 )
-public class EligibilityRules extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class EligibilityRules extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "EligibilityRules",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
index 27bdbe45d..cd3e17db3 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class InstallmentCalculation extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class InstallmentCalculation extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "InstallmentCalculation",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
index 33778bb08..d48ed6bb3 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PostBureauAffordability extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauAffordability extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauAffordability",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
index d97abe1f4..e1dbfb74b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PostBureauRiskCategory extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauRiskCategory extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauRiskCategory",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
index c0f933a6b..ec2e18c1c 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 13
 )
-public class PostBureauRiskCategoryTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PostBureauRiskCategoryTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Post-bureauRiskCategoryTable",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
index 478502248..0818684ff 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PreBureauAffordability extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauAffordability extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauAffordability",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
index c25d9a938..e6c2993cc 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class PreBureauRiskCategory extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauRiskCategory extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauRiskCategory",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
index c6430928c..5ce913feb 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 8
 )
-public class PreBureauRiskCategoryTable extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class PreBureauRiskCategoryTable extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Pre-bureauRiskCategoryTable",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
index 0b604ce14..ce965ef7f 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class RequiredMonthlyInstallment extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class RequiredMonthlyInstallment extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "RequiredMonthlyInstallment",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Routing.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Routing.java
index b5bd4d816..f2a05db9b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Routing.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Routing.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Routing extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Routing extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Routing",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
index 39aef627e..787d9d796 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.PRIORITY,
     rulesCount = 5
 )
-public class RoutingRules extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class RoutingRules extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "RoutingRules",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Strategy.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Strategy.java
index b7b95c70f..189486b43 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Strategy.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Strategy.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNIQUE,
     rulesCount = 3
 )
-public class Strategy extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Strategy extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Strategy",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/BaseVacationDays.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/BaseVacationDays.java
index 8a48f69be..da98d1333 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/BaseVacationDays.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/BaseVacationDays.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class BaseVacationDays extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class BaseVacationDays extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Base Vacation Days",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1.java
index ff2d81908..a05e276f0 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-public class ExtraDaysCase1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ExtraDaysCase1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Extra days case 1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2.java
index 9dae94417..087866d79 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-public class ExtraDaysCase2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ExtraDaysCase2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Extra days case 2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3.java
index 23e5868d3..ef52b5b27 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.COLLECT,
     rulesCount = 2
 )
-public class ExtraDaysCase3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class ExtraDaysCase3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Extra days case 3",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/TotalVacationDays.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/TotalVacationDays.java
index 29b12f021..911bbaa57 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/TotalVacationDays.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/TotalVacationDays.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class TotalVacationDays extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class TotalVacationDays extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "Total Vacation Days",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_001.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_001.java
index a60640281..4246551f6 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_001.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_001.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_001 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_001 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_001",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_002.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_002.java
index c337e2828..02b5b7287 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_002.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_002.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_002 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_002 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_002",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_003.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_003.java
index 8ce7d6592..013af0e1c 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_003.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_003.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_003 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_003 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_003",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_004.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_004.java
index 4b6a9f8c3..35855fedd 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_004.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_004.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_004 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_004 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_004",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_006.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_006.java
index 6cdb48b67..1441ce952 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_006.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_006.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_006 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_006 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_006",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_007.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_007.java
index 3e9d9f291..2bce02754 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_007.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_007.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_007 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_007 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_007",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_009.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_009.java
index 4d508be9f..4ada166af 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_009.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_009.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_009 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_009 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_009",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_011.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_011.java
index 6612e572f..f8434bd7d 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_011.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_011.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_011 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_011 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_011",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_012.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_012.java
index 80cde71a4..ad2e577d2 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_012.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_012.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_012 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_012 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_012",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_013.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_013.java
index 9894806ea..63e02a73a 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_013.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_013.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_013 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_013 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_013",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_014.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_014.java
index 2f4b24c65..5c3ebda79 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_014.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/DecisionService_014.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_014 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_014 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_014",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_001.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_001.java
index a515d58a5..4af232aba 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_001.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_001.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_001 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_001 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_001",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_002.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_002.java
index a0c3901bb..93f430b33 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_002.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_002.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_002 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_002 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_002",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_002_input.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_002_input.java
index 9ed35480a..ba90a4e5a 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_002_input.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_002_input.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_002_input extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_002_input extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_002_input",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003.java
index 6b26befc6..f993d9496 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_003 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_003 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_003",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003_input_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003_input_1.java
index cce304f88..5bd771bf0 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003_input_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003_input_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_003_input_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_003_input_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_003_input_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003_input_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003_input_2.java
index 5adcee386..ed33aa83c 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003_input_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_003_input_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_003_input_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_003_input_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_003_input_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_004_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_004_1.java
index 99de3a400..9ec3f5d28 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_004_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_004_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_004_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_004_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_004_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_004_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_004_2.java
index 98cb7b72a..2ab99b1bf 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_004_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_004_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_004_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_004_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_004_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_1.java
index 571e2fc74..c607df18b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_006_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_006_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_006_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_2.java
index 6f361f186..436ac208f 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_006_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_006_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_006_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_3.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_3.java
index 525d71960..31ef1f377 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_006_3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_006_3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_006_3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_006_3",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_007_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_007_2.java
index 1733af617..9af47a8d2 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_007_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_007_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_007_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_007_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_007_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_007_3.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_007_3.java
index abf713f27..71b4582e6 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_007_3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_007_3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_007_3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_007_3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_007_3",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_1.java
index 4d8610287..75daac6a5 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_009_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_009_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_009_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_2.java
index ef3567dd5..4af045eb0 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_009_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_009_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_009_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_3.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_3.java
index bebedfcc9..d37057cfb 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_009_3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_009_3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_009_3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_009_3",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_1.java
index 5e5a38a4c..cae1d0d8c 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_011_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_011_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_011_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_2.java
index c9ef8f3ea..59ddaf555 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_011_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_011_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_011_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_3.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_3.java
index 46907290f..6e76259fb 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_011_3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_011_3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_011_3",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_4.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_4.java
index e818048c1..7c7587084 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_4.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_011_4.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_011_4 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_011_4 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_011_4",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_1.java
index 968a3500b..a94fd0118 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_012_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_012_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_012_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_2.java
index e87940ada..f2159fe67 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_012_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_012_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_012_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_3.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_3.java
index ae85920df..735940257 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_012_3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_012_3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_012_3",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_4.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_4.java
index 85234ce67..90ff5480b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_4.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_012_4.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_012_4 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_012_4 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_012_4",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_1.java
index bbeb9bfe2..f004aa7b7 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_013_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_013_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_013_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_2.java
index 8ffea85c0..246abde6e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_013_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_013_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_013_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_3.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_3.java
index 7334fb030..fbaca32bc 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_013_3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_013_3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_013_3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_013_3",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_1.java
index 1c277f67b..0d461d6a3 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_014_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_014_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_014_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_2.java
index 390bea678..bd2e9ba34 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_014_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_014_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_014_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_3.java b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_3.java
index 4d5e629f7..b4b0a068f 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0085-decision-services/translator/expected/java/dmn/Decision_014_3.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_014_3 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_014_3 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_014_3",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_003_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_003_1.java
index 039a63d14..92059e683 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_003_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_003_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_003_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_003_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_003_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_004_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_004_1.java
index 560b38a54..680c8390b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_004_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_004_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_004_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_004_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_004_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_005_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_005_1.java
index 2ee2fd4db..092138147 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_005_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_005_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_005_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_005_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_005_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_006_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_006_1.java
index 5c381482d..23d74b685 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_006_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_006_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_006_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_006_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_006_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_008_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_008_1.java
index 9e723a9ea..4230acd42 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_008_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_008_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_008_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_008_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_008_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_009_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_009_1.java
index a2be6892e..4b684a6b3 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_009_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_009_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_009_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_009_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_009_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1.java
index 09d8153d7..ad554344d 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_010_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_010_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_010_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1_a.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1_a.java
index f2e898a9b..72391662d 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1_a.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1_a.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_010_1_a extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_010_1_a extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_010_1_a",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_011_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_011_1.java
index 80d119c7f..b61277e4b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_011_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_011_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_011_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_011_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_011_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_1.java
index 741f9223f..06c8a57f0 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_012_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_012_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_012_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_2.java
index f44605d88..0c76ec6bd 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_012_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_012_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_012_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_013_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_013_1.java
index a51cddf75..649e8e6f3 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_013_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_013_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_013_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_013_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_013_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_017_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_017_1.java
index 30356ede5..aeb0c9e36 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_017_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_017_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_017_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_017_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_017_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_018.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_018.java
index 1b26e02dc..301051366 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_018.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_018.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Bkm_018 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Bkm_018 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "bkm_018",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DecisionService_013_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DecisionService_013_1.java
index 871e86eb2..4906fb05e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DecisionService_013_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DecisionService_013_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class DecisionService_013_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class DecisionService_013_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decisionService_013_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_1.java
index b11f52f0a..36767621a 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_001_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_001_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_001_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_2.java
index 5f0f28de6..46381b31e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_001_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_001_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_001_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_1.java
index 86ec883c3..94b957e6f 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_002_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_002_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_002_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_2.java
index 03a7f0f5a..d5538bd05 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_002_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_002_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_002_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_003_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_003_1.java
index f435b67b6..1a548f786 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_003_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_003_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_003_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_003_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_003_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_004_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_004_1.java
index 6574cee47..224e0ac74 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_004_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_004_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_004_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_004_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_004_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_005_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_005_1.java
index 7acbf4bdb..3f292854e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_005_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_005_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_005_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_005_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_005_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_006_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_006_1.java
index 2b1a4a477..66d3af877 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_006_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_006_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_006_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_006_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_006_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_1.java
index a65f4547b..91b41eb4a 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_007_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_007_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_007_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_2.java
index 97a427884..e15e3383a 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_007_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_007_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_007_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_008_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_008_1.java
index ff5722f5b..09a1587e5 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_008_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_008_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_008_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_008_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_008_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_009_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_009_1.java
index 4a8720a30..93140ecf6 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_009_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_009_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_009_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_009_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_009_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1.java
index bf2a89382..c8ed4bea6 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_010_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_010_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_010_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1_a.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1_a.java
index 3cb5259d6..e8da0fa22 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1_a.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1_a.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_010_1_a extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_010_1_a extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_010_1_a",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2.java
index 5967ceb16..30b177961 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_010_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_010_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_010_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2_a.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2_a.java
index 3a06825b1..1e89f1784 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2_a.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2_a.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_010_2_a extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_010_2_a extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_010_2_a",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_011_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_011_1.java
index 0f70fb2c8..e07b6f50e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_011_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_011_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_011_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_011_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_011_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_012_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_012_1.java
index fd5c9ed49..36a73933e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_012_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_012_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_012_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_012_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_012_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_1.java
index b6de6a289..1849367bd 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_013_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_013_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_013_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_2.java
index c2b9bb630..191a5e9fb 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_2.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_013_2 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_013_2 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_013_2",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_017_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_017_1.java
index 30f2264c1..62fc6e0fd 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_017_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_017_1.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_017_1 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_017_1 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_017_1",
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_018.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_018.java
index 8ad18aa30..5b3f216b3 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_018.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_018.java
@@ -12,7 +12,7 @@
     hitPolicy = com.gs.dmn.runtime.annotation.HitPolicy.UNKNOWN,
     rulesCount = -1
 )
-public class Decision_018 extends com.gs.dmn.runtime.DefaultDMNBaseDecision {
+public class Decision_018 extends com.gs.dmn.runtime.JavaTimeDMNBaseDecision {
     public static final com.gs.dmn.runtime.listener.DRGElement DRG_ELEMENT_METADATA = new com.gs.dmn.runtime.listener.DRGElement(
         "",
         "decision_018",

From 99c4a27e6fda50e6510bb98649fd9ec28bac36f3 Mon Sep 17 00:00:00 2001
From: Octavian Patrascoiu <opatrascoiu@yahoo.com>
Date: Wed, 19 Jun 2024 16:12:32 +0100
Subject: [PATCH 3/3] [#675] JavaTime dialects: Use Number instead of
 BigDecimal in JavaTime dialects.

---
 .../dialect/JavaTimeDMNDialectDefinition.java |   5 +-
 ...imeKotlinStandardDMNDialectDefinition.java |   5 +-
 ...imePythonStandardDMNDialectDefinition.java |   5 +-
 ...eMixedJavaTimeKotlinNativeTypeFactory.java |   5 +
 .../DoubleMixedJavaTimeNativeTypeFactory.java |   5 +
 .../type/JavaTimeNativeTypeFactory.java       |   4 +-
 .../synthesis/type/NativeTypeFactory.java     |   5 +
 .../basic/BasicDMNToJavaTransformer.java      |   6 +-
 .../transformation/native_/JavaFactory.java   |   4 +-
 .../JavaTimeDMNDialectDefinitionTest.java     |   5 +-
 ...otlinStandardDMNDialectDefinitionTest.java |   5 +-
 .../dmn/feel/AbstractFEELProcessorTest.java   |  29 +-
 .../AbstractStandardFEELProcessorTest.java    |  14 +-
 .../gs/dmn/feel/JavaFEELProcessorTest.java    |  17 +-
 .../FEELToTripleNativeVisitorTest.java        |   7 +-
 .../interpreter/CL2DMNInterpreterTest.java    |   5 +-
 .../interpreter/CL3DMNInterpreterTest.java    |   5 +-
 ...TestCasesToPythonJUnitTransformerTest.java |   7 +-
 .../dmn/tck/MockTCKValueTranslatorTest.java   |   7 +-
 .../AbstractTckDMNToJavaTransformerTest.java  |   8 +-
 ...AbstractTckDMNToKotlinTransformerTest.java |   8 +-
 ...AbstractTckDMNToPythonTransformerTest.java |   5 +-
 .../CL3DMNToLambdaTransformerTest.java        |   2 +-
 .../com/gs/dmn/feel/lib/DefaultFEELLib.java   |  10 +-
 .../com/gs/dmn/feel/lib/JavaTimeFEELLib.java  |  18 +-
 .../gs/dmn/feel/lib/MixedJavaTimeFEELLib.java |  10 +-
 .../lib/type/numeric/DecimalNumericLib.java   | 314 ++++++++++++++++++
 .../lib/type/numeric/DecimalNumericType.java  | 162 +++++++++
 .../lib/type/numeric/DefaultNumericLib.java   | 274 +++------------
 .../lib/type/numeric/DefaultNumericType.java  | 137 +++-----
 .../time/pure/TemporalAmountDurationType.java |  18 +-
 .../signavio/feel/lib/DefaultSignavioLib.java |  10 +-
 .../feel/lib/JavaTimeSignavioLib.java         |  26 +-
 .../feel/lib/MixedJavaTimeSignavioLib.java    |  10 +-
 .../numeric/DecimalSignavioNumberLib.java     | 275 +++++++++++++++
 .../numeric/DecimalSignavioNumericType.java   |  22 ++
 .../numeric/DefaultSignavioNumberLib.java     | 239 +++----------
 .../numeric/DefaultSignavioNumericType.java   |   2 -
 .../lib/JavaTimeFEELLibExceptionsTest.java    |  11 +-
 .../gs/dmn/feel/lib/JavaTimeFEELLibTest.java  |   3 +-
 .../TemporalDateTimeDefaultRangeLibTest.java  |   5 +-
 .../TemporalDurationDefaultRangeLibTest.java  |   5 +-
 .../TemporalTimeDefaultRangeLibTest.java      |   5 +-
 .../JavaTimeJsonSerializerTest.java           |   6 +-
 .../JavaTimeSignavioLibExceptionsTest.java    |  11 +-
 .../feel/lib/JavaTimeSignavioLibTest.java     |   3 +-
 .../JavaTimeSignavioDMNDialectDefinition.java |   5 +-
 .../HandwrittenMonthlyPaymentTest.java        |  14 +-
 .../HandwrittenDecisionTest.java              |  23 +-
 .../PostorderTraceListenerTest.java           |  11 +-
 .../TreeTraceListenerTest.java                |  15 +-
 .../java/dmn/decisioninputs/type/TA.java      |   4 +-
 .../java/dmn/decisioninputs/type/TAImpl.java  |   8 +-
 .../java/dmn/decisiontables/PriceGt10.java    |   4 +-
 .../java/dmn/decisiontables/PriceInRange.java |  12 +-
 .../java/dmn/decisioninputs1/type/TA.java     |   4 +-
 .../java/dmn/decisioninputs1/type/TAImpl.java |   8 +-
 .../java/dmn/decisiontables/PriceGt10.java    |   4 +-
 .../java/dmn/decisiontables/PriceInRange.java |  12 +-
 .../translator/expected/java/dmn/C.java       |   4 +-
 .../expected/java/dmn/model_a/Bkm.java        |   4 +-
 .../expected/java/dmn/model_c/C.java          |   4 +-
 .../expected/java/dmn/AgeClassification.java  |   6 +-
 .../java/dmn/AgeClassificationRuleOutput.java |   6 +-
 .../java/dmn/CalculateDiscountedPrice.java    |  16 +-
 .../expected/java/dmn/type/Student.java       |   4 +-
 .../expected/java/dmn/type/StudentImpl.java   |   8 +-
 .../expected/java/dmn/PriceGt10.java          |   8 +-
 .../translator/expected/java/dmn/type/TA.java |   4 +-
 .../expected/java/dmn/type/TAImpl.java        |   8 +-
 .../java/dmn/AffordabilityCalculation.java    |  14 +-
 .../proto3/java/dmn/ApplicationRiskScore.java |  20 +-
 .../java/dmn/ApplicationRiskScoreModel.java   |  38 +--
 .../ApplicationRiskScoreModelRuleOutput.java  |   6 +-
 .../dmn/CreditContingencyFactorTable.java     |  14 +-
 ...reditContingencyFactorTableRuleOutput.java |   6 +-
 .../expected/proto3/java/dmn/Eligibility.java |   2 +-
 .../proto3/java/dmn/EligibilityRules.java     |  12 +-
 .../java/dmn/InstallmentCalculation.java      |  22 +-
 .../java/dmn/PostBureauAffordability.java     |   4 +-
 .../java/dmn/PostBureauRiskCategory.java      |   4 +-
 .../java/dmn/PostBureauRiskCategoryTable.java |  32 +-
 .../java/dmn/PreBureauAffordability.java      |   4 +-
 .../java/dmn/PreBureauRiskCategory.java       |   2 +-
 .../java/dmn/PreBureauRiskCategoryTable.java  |  20 +-
 .../java/dmn/RequiredMonthlyInstallment.java  |  20 +-
 .../expected/proto3/java/dmn/Routing.java     |   2 +-
 .../proto3/java/dmn/RoutingRules.java         |  14 +-
 .../proto3/java/dmn/type/Monthly.java         |  12 +-
 .../proto3/java/dmn/type/MonthlyImpl.java     |  20 +-
 .../proto3/java/dmn/type/TApplicantData.java  |   4 +-
 .../java/dmn/type/TApplicantDataImpl.java     |   8 +-
 .../proto3/java/dmn/type/TBureauData.java     |   4 +-
 .../proto3/java/dmn/type/TBureauDataImpl.java |   8 +-
 .../java/dmn/type/TRequestedProduct.java      |  12 +-
 .../java/dmn/type/TRequestedProductImpl.java  |  20 +-
 .../expected/java/dmn/ApprovalStatus.java     |  12 +-
 .../expected/java/dmn/ApprovalStatus.java     |  12 +-
 .../expected/java/dmn/ApprovalStatus.java     |  12 +-
 .../expected/java/dmn/ApprovalStatus.java     |   8 +-
 .../translator/expected/java/dmn/Payment.java |  14 +-
 .../expected/java/dmn/type/TLoan.java         |  12 +-
 .../expected/java/dmn/type/TLoanImpl.java     |  20 +-
 .../expected/java/dmn/MonthlyPayment.java     |  16 +-
 .../translator/expected/java/dmn/PMT.java     |  18 +-
 .../expected/java/dmn/type/TLoan.java         |  12 +-
 .../expected/java/dmn/type/TLoanImpl.java     |  20 +-
 .../expected/java/dmn/Approval.java           |  14 +-
 .../java/dmn/AffordabilityCalculation.java    |  14 +-
 .../java/dmn/ApplicationRiskScore.java        |  14 +-
 .../java/dmn/ApplicationRiskScoreModel.java   |  38 +--
 .../ApplicationRiskScoreModelRuleOutput.java  |   6 +-
 .../dmn/CreditContingencyFactorTable.java     |  14 +-
 ...reditContingencyFactorTableRuleOutput.java |   6 +-
 .../expected/java/dmn/Eligibility.java        |   2 +-
 .../expected/java/dmn/EligibilityRules.java   |  12 +-
 .../java/dmn/InstallmentCalculation.java      |  22 +-
 .../java/dmn/PostBureauAffordability.java     |   4 +-
 .../java/dmn/PostBureauRiskCategory.java      |   4 +-
 .../java/dmn/PostBureauRiskCategoryTable.java |  32 +-
 .../java/dmn/PreBureauAffordability.java      |   4 +-
 .../java/dmn/PreBureauRiskCategory.java       |   2 +-
 .../java/dmn/PreBureauRiskCategoryTable.java  |  20 +-
 .../java/dmn/RequiredMonthlyInstallment.java  |  14 +-
 .../translator/expected/java/dmn/Routing.java |   2 +-
 .../expected/java/dmn/RoutingRules.java       |  14 +-
 .../expected/java/dmn/type/Monthly.java       |  12 +-
 .../expected/java/dmn/type/MonthlyImpl.java   |  20 +-
 .../java/dmn/type/TApplicantData.java         |   4 +-
 .../java/dmn/type/TApplicantDataImpl.java     |   8 +-
 .../expected/java/dmn/type/TBureauData.java   |   4 +-
 .../java/dmn/type/TBureauDataImpl.java        |   8 +-
 .../java/dmn/type/TRequestedProduct.java      |  12 +-
 .../java/dmn/type/TRequestedProductImpl.java  |  20 +-
 .../expected/java/dmn/MonthlyPayment.java     |  16 +-
 .../translator/expected/java/dmn/PMT.java     |  18 +-
 .../expected/java/dmn/type/TLoan.java         |  12 +-
 .../expected/java/dmn/type/TLoanImpl.java     |  20 +-
 .../translator/expected/java/dmn/Join.java    |   2 +-
 .../expected/java/dmn/type/TDeptTable.java    |   4 +-
 .../java/dmn/type/TDeptTableImpl.java         |   8 +-
 .../java/dmn/type/TEmployeeTable.java         |   4 +-
 .../java/dmn/type/TEmployeeTableImpl.java     |   8 +-
 .../translator/expected/java/dmn/Sort1.java   |  18 +-
 .../translator/expected/java/dmn/Sort2.java   |   2 +-
 .../expected/java/dmn/type/TRow.java          |  16 +-
 .../expected/java/dmn/type/TRowImpl.java      |  26 +-
 .../expected/java/dmn/Equity36Mo.java         |  20 +-
 .../expected/java/dmn/FinancialMetrics.java   |  18 +-
 .../expected/java/dmn/MonthlyPayment.java     |  18 +-
 .../expected/java/dmn/RankedProducts.java     |  12 +-
 .../expected/java/dmn/type/TLoanProduct.java  |  12 +-
 .../java/dmn/type/TLoanProductImpl.java       |  20 +-
 .../expected/java/dmn/type/TMetric.java       |  28 +-
 .../expected/java/dmn/type/TMetricImpl.java   |  44 +--
 .../expected/java/dmn/EveryGtTen1.java        |   2 +-
 .../expected/java/dmn/EveryGtTen2.java        |   2 +-
 .../expected/java/dmn/EveryGtTen3.java        |   2 +-
 .../translator/expected/java/dmn/GtTen.java   |   4 +-
 .../expected/java/dmn/SomeGtTen1.java         |   2 +-
 .../expected/java/dmn/SomeGtTen2.java         |   2 +-
 .../expected/java/dmn/type/TItemPrice.java    |   4 +-
 .../java/dmn/type/TItemPriceImpl.java         |   8 +-
 .../expected/java/dmn/PriceGt10.java          |   4 +-
 .../expected/java/dmn/PriceInRange.java       |  12 +-
 .../translator/expected/java/dmn/type/TA.java |   4 +-
 .../expected/java/dmn/type/TAImpl.java        |   8 +-
 .../expected/java/dmn/BaseVacationDays.java   |  12 +-
 .../expected/java/dmn/ExtraDaysCase1.java     |  22 +-
 .../java/dmn/ExtraDaysCase1RuleOutput.java    |   6 +-
 .../expected/java/dmn/ExtraDaysCase2.java     |  22 +-
 .../java/dmn/ExtraDaysCase2RuleOutput.java    |   6 +-
 .../expected/java/dmn/ExtraDaysCase3.java     |  22 +-
 .../java/dmn/ExtraDaysCase3RuleOutput.java    |   6 +-
 .../expected/java/dmn/TotalVacationDays.java  |  24 +-
 .../expected/java/dmn/Circumference.java      |  14 +-
 .../dmn/FnInvocationComplexParameters.java    |  12 +-
 .../java/dmn/FnInvocationNamedParameters.java |  14 +-
 .../dmn/FnInvocationPositionalParameters.java |  12 +-
 .../expected/java/dmn/FnLibrary.java          |   8 +-
 .../TFnInvocationComplexParamsResult.java     |  12 +-
 .../TFnInvocationComplexParamsResultImpl.java |  20 +-
 .../dmn/type/TFnInvocationNamedResult.java    |  16 +-
 .../type/TFnInvocationNamedResultImpl.java    |  26 +-
 .../type/TFnInvocationPositionalResult.java   |  12 +-
 .../TFnInvocationPositionalResultImpl.java    |  20 +-
 .../translator/expected/java/dmn/FACT.java    |  14 +-
 .../translator/expected/java/dmn/Main.java    |  14 +-
 .../expected/java/dmn/Incorrect_001.java      |  14 +-
 .../expected/java/dmn/Incorrect_002.java      |  14 +-
 .../expected/java/dmn/Incorrect_003.java      |  14 +-
 .../expected/java/dmn/Literal_001.java        |  14 +-
 .../expected/java/dmn/Literal_002.java        |  14 +-
 .../expected/java/dmn/Literal_003.java        |  14 +-
 .../expected/java/dmn/Literal_004.java        |  14 +-
 .../expected/java/dmn/Literal_005.java        |  14 +-
 .../expected/java/dmn/Literal_006.java        |  14 +-
 .../expected/java/dmn/Literal_008.java        |  14 +-
 .../expected/java/dmn/type/Applicant.java     |   4 +-
 .../expected/java/dmn/type/ApplicantImpl.java |   8 +-
 .../java/dmn/AffordabilityCalculation.java    |  14 +-
 .../java/dmn/ApplicationRiskScore.java        |  14 +-
 .../java/dmn/ApplicationRiskScoreModel.java   |  38 +--
 .../ApplicationRiskScoreModelRuleOutput.java  |   6 +-
 .../dmn/CreditContingencyFactorTable.java     |  14 +-
 ...reditContingencyFactorTableRuleOutput.java |   6 +-
 .../expected/java/dmn/Eligibility.java        |   2 +-
 .../expected/java/dmn/EligibilityRules.java   |  12 +-
 .../java/dmn/InstallmentCalculation.java      |  22 +-
 .../java/dmn/PostBureauAffordability.java     |   4 +-
 .../java/dmn/PostBureauRiskCategory.java      |   4 +-
 .../java/dmn/PostBureauRiskCategoryTable.java |  32 +-
 .../java/dmn/PreBureauAffordability.java      |   4 +-
 .../java/dmn/PreBureauRiskCategory.java       |   2 +-
 .../java/dmn/PreBureauRiskCategoryTable.java  |  20 +-
 .../java/dmn/RequiredMonthlyInstallment.java  |  14 +-
 .../translator/expected/java/dmn/Routing.java |   2 +-
 .../expected/java/dmn/RoutingRules.java       |  14 +-
 .../expected/java/dmn/type/Monthly.java       |  12 +-
 .../expected/java/dmn/type/MonthlyImpl.java   |  20 +-
 .../java/dmn/type/TApplicantData.java         |   4 +-
 .../java/dmn/type/TApplicantDataImpl.java     |   8 +-
 .../expected/java/dmn/type/TBureauData.java   |   4 +-
 .../java/dmn/type/TBureauDataImpl.java        |   8 +-
 .../java/dmn/type/TRequestedProduct.java      |  12 +-
 .../java/dmn/type/TRequestedProductImpl.java  |  20 +-
 .../src/main/java/BaseVacationDays.java       |  12 +-
 .../src/main/java/ExtraDaysCase1.java         |  22 +-
 .../main/java/ExtraDaysCase1RuleOutput.java   |   6 +-
 .../src/main/java/ExtraDaysCase2.java         |  22 +-
 .../main/java/ExtraDaysCase2RuleOutput.java   |   6 +-
 .../src/main/java/ExtraDaysCase3.java         |  22 +-
 .../main/java/ExtraDaysCase3RuleOutput.java   |   6 +-
 .../src/main/java/TotalVacationDays.java      |  24 +-
 .../expected/java/dmn/Bkm_003_1.java          |  14 +-
 .../expected/java/dmn/Bkm_004_1.java          |  14 +-
 .../expected/java/dmn/Bkm_005_1.java          |  16 +-
 .../expected/java/dmn/Bkm_006_1.java          |  16 +-
 .../expected/java/dmn/Bkm_008_1.java          |  16 +-
 .../expected/java/dmn/Bkm_009_1.java          |  16 +-
 .../expected/java/dmn/Bkm_010_1.java          |  16 +-
 .../expected/java/dmn/Bkm_010_1_a.java        |  16 +-
 .../expected/java/dmn/Bkm_011_1.java          |  16 +-
 .../expected/java/dmn/Bkm_012_1.java          |  16 +-
 .../expected/java/dmn/Bkm_012_2.java          |  14 +-
 .../expected/java/dmn/Bkm_013_1.java          |  16 +-
 .../java/dmn/DecisionService_013_1.java       |  16 +-
 .../expected/java/dmn/Decision_001_1.java     |  14 +-
 .../expected/java/dmn/Decision_001_2.java     |  14 +-
 .../expected/java/dmn/Decision_002_1.java     |  14 +-
 .../expected/java/dmn/Decision_002_2.java     |  14 +-
 .../expected/java/dmn/Decision_003_1.java     |  12 +-
 .../expected/java/dmn/Decision_004_1.java     |  12 +-
 .../expected/java/dmn/Decision_005_1.java     |  12 +-
 .../expected/java/dmn/Decision_006_1.java     |  12 +-
 .../expected/java/dmn/Decision_007_1.java     |  16 +-
 .../expected/java/dmn/Decision_007_2.java     |  16 +-
 .../expected/java/dmn/Decision_008_1.java     |  12 +-
 .../expected/java/dmn/Decision_009_1.java     |  14 +-
 .../expected/java/dmn/Decision_010_1.java     |  14 +-
 .../expected/java/dmn/Decision_010_1_a.java   |  14 +-
 .../expected/java/dmn/Decision_010_2.java     |  12 +-
 .../expected/java/dmn/Decision_010_2_a.java   |  12 +-
 .../expected/java/dmn/Decision_011_1.java     |  16 +-
 .../expected/java/dmn/Decision_012_1.java     |  12 +-
 .../expected/java/dmn/Decision_013_1.java     |  12 +-
 .../expected/java/dmn/Decision_013_2.java     |  14 +-
 267 files changed, 2450 insertions(+), 2044 deletions(-)
 create mode 100644 dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DecimalNumericLib.java
 create mode 100644 dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DecimalNumericType.java
 create mode 100644 dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DecimalSignavioNumberLib.java
 create mode 100644 dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DecimalSignavioNumericType.java

diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinition.java
index b04d9d3e6..ff8d82815 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinition.java
@@ -31,12 +31,11 @@
 import com.gs.dmn.transformation.template.TemplateProvider;
 import com.gs.dmn.validation.DMNValidator;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimeDMNDialectDefinition extends AbstractStandardDMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeDMNDialectDefinition extends AbstractStandardDMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     //
     // DMN Processors
     //
@@ -60,7 +59,7 @@ public NativeTypeFactory createNativeTypeFactory() {
     }
 
     @Override
-    public FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> createFEELLib() {
+    public FEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> createFEELLib() {
         return new JavaTimeFEELLib();
     }
 
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinition.java
index 7a57e4de8..8b0384cd3 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinition.java
@@ -32,12 +32,11 @@
 import com.gs.dmn.transformation.template.TemplateProvider;
 import com.gs.dmn.validation.DMNValidator;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimeKotlinStandardDMNDialectDefinition extends AbstractStandardDMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeKotlinStandardDMNDialectDefinition extends AbstractStandardDMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     //
     // DMN Processors
     //
@@ -61,7 +60,7 @@ public NativeTypeFactory createNativeTypeFactory() {
     }
 
     @Override
-    public FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> createFEELLib() {
+    public FEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> createFEELLib() {
         return new JavaTimeFEELLib();
     }
 
diff --git a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimePythonStandardDMNDialectDefinition.java b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimePythonStandardDMNDialectDefinition.java
index 38d90384b..0f2042e20 100644
--- a/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimePythonStandardDMNDialectDefinition.java
+++ b/dmn-core/src/main/java/com/gs/dmn/dialect/JavaTimePythonStandardDMNDialectDefinition.java
@@ -32,12 +32,11 @@
 import com.gs.dmn.transformation.template.TemplateProvider;
 import com.gs.dmn.validation.DMNValidator;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimePythonStandardDMNDialectDefinition extends AbstractStandardDMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimePythonStandardDMNDialectDefinition extends AbstractStandardDMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     //
     // DMN Processors
     //
@@ -61,7 +60,7 @@ public NativeTypeFactory createNativeTypeFactory() {
     }
 
     @Override
-    public FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> createFEELLib() {
+    public FEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> createFEELLib() {
         return new JavaTimeFEELLib();
     }
 
diff --git a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/DoubleMixedJavaTimeKotlinNativeTypeFactory.java b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/DoubleMixedJavaTimeKotlinNativeTypeFactory.java
index 9ee536866..9a1ff1a3e 100644
--- a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/DoubleMixedJavaTimeKotlinNativeTypeFactory.java
+++ b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/DoubleMixedJavaTimeKotlinNativeTypeFactory.java
@@ -67,4 +67,9 @@ public String toNativeType(String feelType) {
     public String toQualifiedNativeType(String feelType) {
         return FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.get(feelType);
     }
+
+    @Override
+    public String getNativeNumberConcreteType() {
+        return Double.class.getName();
+    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/DoubleMixedJavaTimeNativeTypeFactory.java b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/DoubleMixedJavaTimeNativeTypeFactory.java
index 9022112b6..879c0b75e 100644
--- a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/DoubleMixedJavaTimeNativeTypeFactory.java
+++ b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/DoubleMixedJavaTimeNativeTypeFactory.java
@@ -67,4 +67,9 @@ public String toNativeType(String feelType) {
     public String toQualifiedNativeType(String feelType) {
         return FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.get(feelType);
     }
+
+    @Override
+    public String getNativeNumberConcreteType() {
+        return Double.class.getName();
+    }
 }
diff --git a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/JavaTimeNativeTypeFactory.java b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/JavaTimeNativeTypeFactory.java
index db1837326..de6ed59b1 100644
--- a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/JavaTimeNativeTypeFactory.java
+++ b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/JavaTimeNativeTypeFactory.java
@@ -38,7 +38,7 @@ public class JavaTimeNativeTypeFactory extends JavaTypeFactory {
         FEEL_TYPE_TO_JAVA_TYPE.put(DATE.getName(), java.time.LocalDate.class.getName());
         FEEL_TYPE_TO_JAVA_TYPE.put(STRING.getName(), String.class.getSimpleName());
         FEEL_TYPE_TO_JAVA_TYPE.put(BOOLEAN.getName(), Boolean.class.getSimpleName());
-        FEEL_TYPE_TO_JAVA_TYPE.put(NUMBER.getName(), java.math.BigDecimal.class.getName());
+        FEEL_TYPE_TO_JAVA_TYPE.put(NUMBER.getName(), java.lang.Number.class.getName());
         FEEL_TYPE_TO_JAVA_TYPE.put(ANY.getName(), Object.class.getSimpleName());
         FEEL_TYPE_TO_JAVA_TYPE.put(NULL.getName(), Object.class.getSimpleName());
     }
@@ -53,7 +53,7 @@ public class JavaTimeNativeTypeFactory extends JavaTypeFactory {
         FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(DATE.getName(), java.time.LocalDate.class.getName());
         FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(STRING.getName(), String.class.getName());
         FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(BOOLEAN.getName(), Boolean.class.getName());
-        FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(NUMBER.getName(), java.math.BigDecimal.class.getName());
+        FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(NUMBER.getName(), java.lang.Number.class.getName());
         FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(ANY.getName(), Object.class.getName());
         FEEL_TYPE_TO_QUALIFIED_JAVA_TYPE.put(NULL.getName(), Object.class.getName());
     }
diff --git a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/NativeTypeFactory.java b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/NativeTypeFactory.java
index 660bc0be4..0e5f3d2c2 100644
--- a/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/NativeTypeFactory.java
+++ b/dmn-core/src/main/java/com/gs/dmn/feel/synthesis/type/NativeTypeFactory.java
@@ -14,6 +14,8 @@
 
 import com.gs.dmn.feel.analysis.semantics.type.*;
 
+import java.math.BigDecimal;
+
 public interface NativeTypeFactory {
     String toNativeType(String feelType);
 
@@ -31,6 +33,9 @@ public interface NativeTypeFactory {
     default String getNativeNumberType() {
         return toNativeType(NumberType.NUMBER.getName());
     }
+    default String getNativeNumberConcreteType() {
+        return BigDecimal.class.getName();
+    }
 
     default String getNativeDateType() {
         return toNativeType(DateType.DATE.getName());
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java b/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java
index 77848e06e..9c521f85f 100644
--- a/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java
+++ b/dmn-core/src/main/java/com/gs/dmn/transformation/basic/BasicDMNToJavaTransformer.java
@@ -2357,12 +2357,12 @@ public boolean isInteger(TItemDefinition element) {
 
     @Override
     public String makeIntegerForInput(String text) {
-        return this.nativeFactory.constructor(getNativeNumberType(), String.format("java.lang.Integer.toString(%s)", text));
+        return this.nativeFactory.constructor(this.nativeTypeFactory.getNativeNumberConcreteType(), String.format("java.lang.Integer.toString(%s)", text));
     }
 
     @Override
     public String makeDecimalForInput(String text) {
-        return this.nativeFactory.constructor(getNativeNumberType(), String.format("java.lang.Double.toString(%s)", text));
+        return this.nativeFactory.constructor(this.nativeTypeFactory.getNativeNumberConcreteType(), String.format("java.lang.Double.toString(%s)", text));
     }
 
     @Override
@@ -2370,7 +2370,7 @@ public String makeDecimalForDecision(String text) {
         if (StringUtils.isBlank(text)) {
             return this.nativeFactory.nullLiteral();
         } else {
-            return this.nativeFactory.constructor(getNativeNumberType(), text);
+            return this.nativeFactory.constructor(this.nativeTypeFactory.getNativeNumberConcreteType(), text);
         }
     }
 
diff --git a/dmn-core/src/main/java/com/gs/dmn/transformation/native_/JavaFactory.java b/dmn-core/src/main/java/com/gs/dmn/transformation/native_/JavaFactory.java
index 321256a82..bcd378b60 100644
--- a/dmn-core/src/main/java/com/gs/dmn/transformation/native_/JavaFactory.java
+++ b/dmn-core/src/main/java/com/gs/dmn/transformation/native_/JavaFactory.java
@@ -544,7 +544,7 @@ public String extractMemberFromProtoValue(String protoValue, Type type, boolean
         type = Type.extractTypeFromConstraint(type);
         if (FEELTypes.FEEL_PRIMITIVE_TYPES.contains(type)) {
             if (type == NumberType.NUMBER) {
-                String qNativeType = this.transformer.getNativeTypeFactory().toQualifiedNativeType(((DataType) type).getName());
+                String qNativeType = this.transformer.getNativeTypeFactory().getNativeNumberConcreteType();
                 return String.format("%s.valueOf(%s)", qNativeType, protoValue);
             } else if (type == BooleanType.BOOLEAN) {
                 return protoValue;
@@ -565,7 +565,7 @@ public String extractMemberFromProtoValue(String protoValue, Type type, boolean
             String mapFunction;
             if (FEELTypes.FEEL_PRIMITIVE_TYPES.contains(elementType)) {
                 if (elementType == NumberType.NUMBER) {
-                    String qNativeType = this.transformer.getNativeTypeFactory().toQualifiedNativeType(((DataType) elementType).getName());
+                    String qNativeType = this.transformer.getNativeTypeFactory().getNativeNumberConcreteType();
                     mapFunction = String.format("e -> %s.valueOf(e)", qNativeType);
                 } else if (elementType == BooleanType.BOOLEAN) {
                     mapFunction =  "e -> e";
diff --git a/dmn-core/src/test/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinitionTest.java b/dmn-core/src/test/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinitionTest.java
index c21f5ec07..a72459ab3 100644
--- a/dmn-core/src/test/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinitionTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/dialect/JavaTimeDMNDialectDefinitionTest.java
@@ -20,14 +20,13 @@
 import com.gs.dmn.transformation.DMNToJavaTransformer;
 import com.gs.dmn.transformation.basic.BasicDMNToJavaTransformer;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimeDMNDialectDefinitionTest extends AbstractStandardDMNDialectDefinitionTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeDMNDialectDefinitionTest extends AbstractStandardDMNDialectDefinitionTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialect() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialect() {
         return new JavaTimeDMNDialectDefinition();
     }
 
diff --git a/dmn-core/src/test/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinitionTest.java b/dmn-core/src/test/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinitionTest.java
index 572320379..636c4b90f 100644
--- a/dmn-core/src/test/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinitionTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/dialect/JavaTimeKotlinStandardDMNDialectDefinitionTest.java
@@ -20,14 +20,13 @@
 import com.gs.dmn.transformation.DMNToKotlinTransformer;
 import com.gs.dmn.transformation.basic.BasicDMNToKotlinTransformer;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimeKotlinStandardDMNDialectDefinitionTest extends AbstractStandardDMNDialectDefinitionTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeKotlinStandardDMNDialectDefinitionTest extends AbstractStandardDMNDialectDefinitionTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialect() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialect() {
         return new JavaTimeKotlinStandardDMNDialectDefinition();
     }
 
diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java
index f552dc8d8..a62ed2a7e 100644
--- a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractFEELProcessorTest.java
@@ -39,6 +39,7 @@
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 
+import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -462,7 +463,7 @@ public void testForExpression() {
         doExpressionTest(entries, "", "for i in 0..4 return if i = 0 then 1 else i * partial[-1]",
                 "ForExpression(Iterator(i in RangeIteratorDomain(NumericLiteral(0), NumericLiteral(4))) -> IfExpression(Relational(=,Name(i),NumericLiteral(0)), NumericLiteral(1), Multiplication(*,Name(i),FilterExpression(Name(partial), ArithmeticNegation(NumericLiteral(1))))))",
                 "ListType(number)",
-                "rangeToList(number(\"0\"), number(\"4\")).stream().map(i -> (booleanEqual(numericEqual(i, number(\"0\")), Boolean.TRUE)) ? number(\"1\") : numericMultiply(i, (java.math.BigDecimal)(elementAt(partial, numericUnaryMinus(number(\"1\")))))).collect(Collectors.toList())",
+                "rangeToList(number(\"0\"), number(\"4\")).stream().map(i -> (booleanEqual(numericEqual(i, number(\"0\")), Boolean.TRUE)) ? number(\"1\") : numericMultiply(i, ("+numberType()+")(elementAt(partial, numericUnaryMinus(number(\"1\")))))).collect(Collectors.toList())",
                 null,
                 null
         );
@@ -1992,7 +1993,7 @@ public void testPostfixExpression() {
         doExpressionTest(entries, "", "DeptTable[number = EmployeeTable[name=LastName].deptNum[1]].manager[1]",
                 "FilterExpression(PathExpression(FilterExpression(Name(DeptTable), Relational(=,PathExpression(Name(item), number),FilterExpression(PathExpression(FilterExpression(Name(EmployeeTable), Relational(=,PathExpression(Name(item), name),Name(LastName))), deptNum), NumericLiteral(1)))), manager), NumericLiteral(1))",
                 "string",
-                "(String)(elementAt(deptTable.stream().filter(item -> numericEqual(((java.math.BigDecimal)(item != null ? item.getNumber() : null)), (java.math.BigDecimal)(elementAt(employeeTable.stream().filter(item_1_ -> stringEqual(((String)(item_1_ != null ? item_1_.getName() : null)), lastName) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((java.math.BigDecimal)(x != null ? x.getDeptNum() : null))).collect(Collectors.toList()), number(\"1\")))) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)(x != null ? x.getManager() : null))).collect(Collectors.toList()), number(\"1\")))",
+                "(String)(elementAt(deptTable.stream().filter(item -> numericEqual((("+numberType()+")(item != null ? item.getNumber() : null)), ("+numberType()+")(elementAt(employeeTable.stream().filter(item_1_ -> stringEqual(((String)(item_1_ != null ? item_1_.getName() : null)), lastName) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> (("+numberType()+")(x != null ? x.getDeptNum() : null))).collect(Collectors.toList()), number(\"1\")))) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)(x != null ? x.getManager() : null))).collect(Collectors.toList()), number(\"1\")))",
                 null,
                 null
         );
@@ -2021,7 +2022,7 @@ public void testFilterExpression() {
         doExpressionTest(entries, "", "[{item: 1}, {item: 2}, {item: 3}][item >= 2]",
                 "FilterExpression(ListLiteral(Context(ContextEntry(ContextEntryKey(item) = NumericLiteral(1))),Context(ContextEntry(ContextEntryKey(item) = NumericLiteral(2))),Context(ContextEntry(ContextEntryKey(item) = NumericLiteral(3)))), Relational(>=,PathExpression(Name(item), item),NumericLiteral(2)))",
                 "ListType(ContextType(item = number))",
-                "asList(new com.gs.dmn.runtime.Context().add(\"item\", number(\"1\")), new com.gs.dmn.runtime.Context().add(\"item\", number(\"2\")), new com.gs.dmn.runtime.Context().add(\"item\", number(\"3\"))).stream().filter(item -> numericGreaterEqualThan(((java.math.BigDecimal)((com.gs.dmn.runtime.Context)item).get(\"item\")), number(\"2\")) == Boolean.TRUE).collect(Collectors.toList())",
+                "asList(new com.gs.dmn.runtime.Context().add(\"item\", number(\"1\")), new com.gs.dmn.runtime.Context().add(\"item\", number(\"2\")), new com.gs.dmn.runtime.Context().add(\"item\", number(\"3\"))).stream().filter(item -> numericGreaterEqualThan((("+numberType()+")((com.gs.dmn.runtime.Context)item).get(\"item\")), number(\"2\")) == Boolean.TRUE).collect(Collectors.toList())",
                 this.lib.asList(new com.gs.dmn.runtime.Context().add("item", this.lib.number("1")), new com.gs.dmn.runtime.Context().add("item", this.lib.number("2")), new com.gs.dmn.runtime.Context().add("item", this.lib.number("3"))).stream().filter(item -> this.lib.numericGreaterEqualThan(((NUMBER)((com.gs.dmn.runtime.Context)item).get("item")), this.lib.number("2")) == Boolean.TRUE).collect(Collectors.toList()),
                 this.lib.asList(new Context().add("item", this.lib.number("2")), new Context().add("item", this.lib.number("3"))));
         doExpressionTest(entries, "", "source[true]",
@@ -2051,19 +2052,19 @@ public void testFilterExpression() {
         doExpressionTest(entries, "", "employee[item.dept = 20]",
                 "FilterExpression(Name(employee), Relational(=,PathExpression(Name(item), dept),NumericLiteral(20)))",
                 "ListType(ContextType(id = number, dept = number, name = string))",
-                "employee.stream().filter(item -> numericEqual(((java.math.BigDecimal)((com.gs.dmn.runtime.Context)item).get(\"dept\")), number(\"20\")) == Boolean.TRUE).collect(Collectors.toList())",
+                "employee.stream().filter(item -> numericEqual((("+numberType()+")((com.gs.dmn.runtime.Context)item).get(\"dept\")), number(\"20\")) == Boolean.TRUE).collect(Collectors.toList())",
                 employeeValue.stream().filter(item -> this.lib.numericEqual(((NUMBER)((com.gs.dmn.runtime.Context)item).get("dept")), this.lib.number("20")) == Boolean.TRUE).collect(Collectors.toList()),
                 Arrays.asList(employeeValue.get(1), employeeValue.get(2)));
         doExpressionTest(entries, "", "employee[item.dept = 20].name",
                 "PathExpression(FilterExpression(Name(employee), Relational(=,PathExpression(Name(item), dept),NumericLiteral(20))), name)",
                 "ListType(string)",
-                "employee.stream().filter(item -> numericEqual(((java.math.BigDecimal)((com.gs.dmn.runtime.Context)item).get(\"dept\")), number(\"20\")) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)((com.gs.dmn.runtime.Context)x).get(\"name\"))).collect(Collectors.toList())",
+                "employee.stream().filter(item -> numericEqual((("+numberType()+")((com.gs.dmn.runtime.Context)item).get(\"dept\")), number(\"20\")) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)((com.gs.dmn.runtime.Context)x).get(\"name\"))).collect(Collectors.toList())",
                 employeeValue.stream().filter(item -> this.lib.numericEqual(((NUMBER)((com.gs.dmn.runtime.Context)item).get("dept")), this.lib.number("20")) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)((com.gs.dmn.runtime.Context)x).get("name"))).collect(Collectors.toList()),
                 Arrays.asList(employeeValue.get(1).get("name"), employeeValue.get(2).get("name")));
         doExpressionTest(entries, "", "employee[dept = 20].name",
                 "PathExpression(FilterExpression(Name(employee), Relational(=,PathExpression(Name(item), dept),NumericLiteral(20))), name)",
                 "ListType(string)",
-                "employee.stream().filter(item -> numericEqual(((java.math.BigDecimal)((com.gs.dmn.runtime.Context)item).get(\"dept\")), number(\"20\")) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)((com.gs.dmn.runtime.Context)x).get(\"name\"))).collect(Collectors.toList())",
+                "employee.stream().filter(item -> numericEqual((("+numberType()+")((com.gs.dmn.runtime.Context)item).get(\"dept\")), number(\"20\")) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)((com.gs.dmn.runtime.Context)x).get(\"name\"))).collect(Collectors.toList())",
                 employeeValue.stream().filter(item -> this.lib.numericEqual((NUMBER)((Context)item).get("dept"), this.lib.number("20"))).collect(Collectors.toList()).stream().map(x -> (String) x.get("name")).collect(Collectors.toList()),
                 Arrays.asList(employeeValue.get(1).get("name"), employeeValue.get(2).get("name")));
 
@@ -2071,25 +2072,25 @@ public void testFilterExpression() {
         doExpressionTest(entries, "", "[1, 2][0]",
                 "FilterExpression(ListLiteral(NumericLiteral(1),NumericLiteral(2)), NumericLiteral(0))",
                 "number",
-                "(java.math.BigDecimal)(elementAt(asList(number(\"1\"), number(\"2\")), number(\"0\")))",
+                "("+numberType()+")(elementAt(asList(number(\"1\"), number(\"2\")), number(\"0\")))",
                 this.lib.elementAt(this.lib.asList(this.lib.number("1"), this.lib.number("2")), this.lib.number("0")),
                 null);
         doExpressionTest(entries, "", "[1, 2][-1]",
                 "FilterExpression(ListLiteral(NumericLiteral(1),NumericLiteral(2)), ArithmeticNegation(NumericLiteral(1)))",
                 "number",
-                "(java.math.BigDecimal)(elementAt(asList(number(\"1\"), number(\"2\")), numericUnaryMinus(number(\"1\"))))",
+                "("+numberType()+")(elementAt(asList(number(\"1\"), number(\"2\")), numericUnaryMinus(number(\"1\"))))",
                 this.lib.elementAt(this.lib.asList(this.lib.number("1"), this.lib.number("2")), this.lib.numericUnaryMinus(this.lib.number("1"))),
                 this.lib.number("2"));
         doExpressionTest(entries, "", "[1, 2][-2]",
                 "FilterExpression(ListLiteral(NumericLiteral(1),NumericLiteral(2)), ArithmeticNegation(NumericLiteral(2)))",
                 "number",
-                "(java.math.BigDecimal)(elementAt(asList(number(\"1\"), number(\"2\")), numericUnaryMinus(number(\"2\"))))",
+                "("+numberType()+")(elementAt(asList(number(\"1\"), number(\"2\")), numericUnaryMinus(number(\"2\"))))",
                 this.lib.elementAt(this.lib.asList(this.lib.number("1"), this.lib.number("2")), this.lib.numericUnaryMinus(this.lib.number("2"))),
                 this.lib.number("1"));
         doExpressionTest(entries, "", "1[1]",
                 "FilterExpression(NumericLiteral(1), NumericLiteral(1))",
                 "number",
-                "(java.math.BigDecimal)(elementAt(asList(number(\"1\")), number(\"1\")))",
+                "("+numberType()+")(elementAt(asList(number(\"1\")), number(\"1\")))",
                 this.lib.elementAt(this.lib.asList(this.lib.number("1")), this.lib.number("1")),
                 this.lib.number("1"));
 
@@ -2097,7 +2098,7 @@ public void testFilterExpression() {
         doExpressionTest(entries, "", "[{x:1, y:2}, {x:2, y:3}] [item.x = 1]",
                 "FilterExpression(ListLiteral(Context(ContextEntry(ContextEntryKey(x) = NumericLiteral(1)),ContextEntry(ContextEntryKey(y) = NumericLiteral(2))),Context(ContextEntry(ContextEntryKey(x) = NumericLiteral(2)),ContextEntry(ContextEntryKey(y) = NumericLiteral(3)))), Relational(=,PathExpression(Name(item), x),NumericLiteral(1)))",
                 "ListType(ContextType(x = number, y = number))",
-                "asList(new com.gs.dmn.runtime.Context().add(\"x\", number(\"1\")).add(\"y\", number(\"2\")), new com.gs.dmn.runtime.Context().add(\"x\", number(\"2\")).add(\"y\", number(\"3\"))).stream().filter(item -> numericEqual(((java.math.BigDecimal)((com.gs.dmn.runtime.Context)item).get(\"x\")), number(\"1\")) == Boolean.TRUE).collect(Collectors.toList())",
+                "asList(new com.gs.dmn.runtime.Context().add(\"x\", number(\"1\")).add(\"y\", number(\"2\")), new com.gs.dmn.runtime.Context().add(\"x\", number(\"2\")).add(\"y\", number(\"3\"))).stream().filter(item -> numericEqual((("+numberType()+")((com.gs.dmn.runtime.Context)item).get(\"x\")), number(\"1\")) == Boolean.TRUE).collect(Collectors.toList())",
                 this.lib.asList(new com.gs.dmn.runtime.Context().add("x", this.lib.number("1")).add("y", this.lib.number("2")), new com.gs.dmn.runtime.Context().add("x", this.lib.number("2")).add("y", this.lib.number("3"))).stream().filter(item -> this.lib.numericEqual(((NUMBER)((com.gs.dmn.runtime.Context)item).get("x")), this.lib.number("1")) == Boolean.TRUE).collect(Collectors.toList()),
                 Arrays.asList(new com.gs.dmn.runtime.Context().add("x", this.lib.number("1")).add("y", this.lib.number("2"))));
     }
@@ -2325,7 +2326,7 @@ public void testList() {
         doExpressionTest(expressionPairs, "", "100[0]",
                 "FilterExpression(NumericLiteral(100), NumericLiteral(0))",
                 "number",
-                "(java.math.BigDecimal)(elementAt(asList(number(\"100\")), number(\"0\")))",
+                "("+numberType()+")(elementAt(asList(number(\"100\")), number(\"0\")))",
                 this.lib.elementAt(this.lib.asList(this.lib.number("100")), this.lib.number("0")),
                 null);
         doExpressionTest(expressionPairs, "", "\"foo\"[0]",
@@ -2711,6 +2712,10 @@ protected TNamedElement getElement() {
         return null;
     }
 
+    protected String numberType() {
+        return BigDecimal.class.getName();
+    }
+
     protected abstract DMNModelRepository makeRepository();
 
     protected abstract DMNDialectDefinition<NUMBER, DATE, TIME, DATE_TIME, DURATION, TEST> makeDialect();
diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractStandardFEELProcessorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractStandardFEELProcessorTest.java
index 6af7ed2e3..776cef4ab 100644
--- a/dmn-core/src/test/java/com/gs/dmn/feel/AbstractStandardFEELProcessorTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/feel/AbstractStandardFEELProcessorTest.java
@@ -195,37 +195,37 @@ public void testFunctionInvocation() {
         doExpressionTest(entries, "", sort2,
                 "FunctionInvocation(Name(sort) -> PositionalParameters(ListLiteral(Name(score5),Name(score6),Name(score7),Name(score8)), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false)))",
                 "ListType(number)",
-                "sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}})",
+                "sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}})",
                 this.lib.sort(this.lib.asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}),
                 this.lib.asList(this.lib.number("8"), this.lib.number("7"), this.lib.number("6"), this.lib.number("5")));
         doExpressionTest(entries, "", sublist2,
                 "FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(ListLiteral(Name(score5),Name(score6),Name(score7),Name(score8)), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(2)))",
                 "ListType(number)",
-                "sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))",
+                "sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))",
                 this.lib.sublist(this.lib.sort(this.lib.asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("2")),
                 this.lib.asList(this.lib.number("8"), this.lib.number("7")));
         doExpressionTest(entries, "", sublist1,
                 "FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(FunctionInvocation(Name(concatenate) -> PositionalParameters(ListLiteral(Name(score1),Name(score2),Name(score3),Name(score4)), FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(ListLiteral(Name(score5),Name(score6),Name(score7),Name(score8)), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(2))))), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(3)))",
                 "ListType(number)",
-                "sublist(sort(concatenate(asList(score1, score2, score3, score4), sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"3\"))",
+                "sublist(sort(concatenate(asList(score1, score2, score3, score4), sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"3\"))",
                 this.lib.sublist(this.lib.sort(this.lib.concatenate(this.lib.asList(score1, score2, score3, score4), this.lib.sublist(this.lib.sort(this.lib.asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("2"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("3")),
                 this.lib.asList(this.lib.number("8"), this.lib.number("7"), this.lib.number("4")));
         doExpressionTest(entries, "", forExp,
                 "ForExpression(Iterator(i in ExpressionIteratorDomain(FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(FunctionInvocation(Name(concatenate) -> PositionalParameters(ListLiteral(Name(score1),Name(score2),Name(score3),Name(score4)), FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(ListLiteral(Name(score5),Name(score6),Name(score7),Name(score8)), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(2))))), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(3))))) -> Multiplication(*,Name(i),Name(i)))",
                 "ListType(number)",
-                "sublist(sort(concatenate(asList(score1, score2, score3, score4), sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"3\")).stream().map(i -> numericMultiply(i, i)).collect(Collectors.toList())",
+                "sublist(sort(concatenate(asList(score1, score2, score3, score4), sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"3\")).stream().map(i -> numericMultiply(i, i)).collect(Collectors.toList())",
                 this.lib.sublist(this.lib.sort(this.lib.concatenate(this.lib.asList(score1, score2, score3, score4), this.lib.sublist(this.lib.sort(this.lib.asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("2"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("3")).stream().map(i -> lib.numericMultiply(i, i)).collect(Collectors.toList()),
                 this.lib.asList(this.lib.number("64"), this.lib.number("49"), this.lib.number("16")));
         doExpressionTest(entries, "", forExp,
                 "ForExpression(Iterator(i in ExpressionIteratorDomain(FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(FunctionInvocation(Name(concatenate) -> PositionalParameters(ListLiteral(Name(score1),Name(score2),Name(score3),Name(score4)), FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(ListLiteral(Name(score5),Name(score6),Name(score7),Name(score8)), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(2))))), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(3))))) -> Multiplication(*,Name(i),Name(i)))",
                 "ListType(number)",
-                "sublist(sort(concatenate(asList(score1, score2, score3, score4), sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"3\")).stream().map(i -> numericMultiply(i, i)).collect(Collectors.toList())",
+                "sublist(sort(concatenate(asList(score1, score2, score3, score4), sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"3\")).stream().map(i -> numericMultiply(i, i)).collect(Collectors.toList())",
                 this.lib.sublist(this.lib.sort(this.lib.concatenate(this.lib.asList(score1, score2, score3, score4), this.lib.sublist(this.lib.sort(this.lib.asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("2"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("3")).stream().map(i -> lib.numericMultiply(i, i)).collect(Collectors.toList()),
                 this.lib.asList(this.lib.number("64"), this.lib.number("49"), this.lib.number("16")));
         doExpressionTest(entries, "", sum,
                 "FunctionInvocation(Name(sum) -> PositionalParameters(ForExpression(Iterator(i in ExpressionIteratorDomain(FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(FunctionInvocation(Name(concatenate) -> PositionalParameters(ListLiteral(Name(score1),Name(score2),Name(score3),Name(score4)), FunctionInvocation(Name(sublist) -> PositionalParameters(FunctionInvocation(Name(sort) -> PositionalParameters(ListLiteral(Name(score5),Name(score6),Name(score7),Name(score8)), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(2))))), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false))), NumericLiteral(1), NumericLiteral(3))))) -> Multiplication(*,Name(i),Name(i)))))",
                 "number",
-                "sum(sublist(sort(concatenate(asList(score1, score2, score3, score4), sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"3\")).stream().map(i -> numericMultiply(i, i)).collect(Collectors.toList()))",
+                "sum(sublist(sort(concatenate(asList(score1, score2, score3, score4), sublist(sort(asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"2\"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}}), number(\"1\"), number(\"3\")).stream().map(i -> numericMultiply(i, i)).collect(Collectors.toList()))",
                 this.lib.sum(this.lib.sublist(this.lib.sort(this.lib.concatenate(this.lib.asList(score1, score2, score3, score4), this.lib.sublist(this.lib.sort(this.lib.asList(score5, score6, score7, score8), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("2"))), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}), this.lib.number("1"), this.lib.number("3")).stream().map(i -> lib.numericMultiply(i, i)).collect(Collectors.toList())),
                 this.lib.number("129"));
 
@@ -1109,7 +1109,7 @@ public void testListFunctions() {
         doExpressionTest(entries, "", "sort([1, 2, 3, 4], function(x: number, y: number) y < x)",
                 "FunctionInvocation(Name(sort) -> PositionalParameters(ListLiteral(NumericLiteral(1),NumericLiteral(2),NumericLiteral(3),NumericLiteral(4)), FunctionDefinition(FormalParameter(x, number, false, false),FormalParameter(y, number, false, false), Relational(<,Name(y),Name(x)), false)))",
                 "ListType(number)",
-                "sort(asList(number(\"1\"), number(\"2\"), number(\"3\"), number(\"4\")), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericLessThan(y, x);}})",
+                "sort(asList(number(\"1\"), number(\"2\"), number(\"3\"), number(\"4\")), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {"+numberType()+" x = ("+numberType()+")args_[0]; "+numberType()+" y = ("+numberType()+")args_[1];return numericLessThan(y, x);}})",
                 this.lib.sort(this.lib.asList(this.lib.number("1"), this.lib.number("2"), this.lib.number("3"), this.lib.number("4")), new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {NUMBER x = (NUMBER)args_[0]; NUMBER y = (NUMBER)args_[1];return lib.numericLessThan(y, x);}}),
                 this.lib.asList(this.lib.number("4"), this.lib.number("3"), this.lib.number("2"), this.lib.number("1")));
         doExpressionTest(entries, "", "sort([\"1\", \"2\", \"3\", \"4\"], function(x: number, y: number) y < x)",
diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/JavaFEELProcessorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/JavaFEELProcessorTest.java
index e04c0a161..8ca44bee4 100644
--- a/dmn-core/src/test/java/com/gs/dmn/feel/JavaFEELProcessorTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/feel/JavaFEELProcessorTest.java
@@ -17,17 +17,16 @@
 import com.gs.dmn.tck.ast.TestCases;
 import org.junit.jupiter.api.Test;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
-public class JavaFEELProcessorTest extends AbstractStandardFEELProcessorTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaFEELProcessorTest extends AbstractStandardFEELProcessorTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialect() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialect() {
         return new JavaTimeDMNDialectDefinition();
     }
 
@@ -36,7 +35,7 @@ protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, Temporal
     public void testConversionFunctions() {
         super.testConversionFunctions();
 
-        List<EnvironmentEntry> entries = Arrays.asList();
+        List<EnvironmentEntry> entries = Collections.emptyList();
 
         doExpressionTest(entries, "", "date and time(date and time(\"2012-03-01T13:14:15Z\"), time(\"10:11:12Z\"))",
                 "FunctionInvocation(Name(date and time) -> PositionalParameters(DateTimeLiteral(date and time, \"2012-03-01T13:14:15Z\"), DateTimeLiteral(time, \"10:11:12Z\")))",
@@ -81,8 +80,7 @@ public void testDateTimeFunctions() {
 
     @Test
     public void testDateAndTimeProperties() {
-        List<EnvironmentEntry> entries = Arrays.asList(
-        );
+        List<EnvironmentEntry> entries = Collections.emptyList();
 
         doExpressionTest(entries, "", "date and time(\"2018-12-10T10:30:00\").time offset",
                 "PathExpression(DateTimeLiteral(date and time, \"2018-12-10T10:30:00\"), time offset)",
@@ -127,4 +125,9 @@ public void testDateAndTimeProperties() {
                 null
         );
     }
+
+    @Override
+    protected String numberType() {
+        return Number.class.getName();
+    }
 }
\ No newline at end of file
diff --git a/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/FEELToTripleNativeVisitorTest.java b/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/FEELToTripleNativeVisitorTest.java
index f10272f4d..8fe0593da 100644
--- a/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/FEELToTripleNativeVisitorTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/feel/synthesis/FEELToTripleNativeVisitorTest.java
@@ -21,7 +21,6 @@
 import org.apache.commons.lang3.StringUtils;
 import org.junit.jupiter.api.Test;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
@@ -34,7 +33,7 @@
 
 public class FEELToTripleNativeVisitorTest extends AbstractTest {
     private final EnvironmentFactory environmentFactory;
-    private final FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> lib;
+    private final FEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> lib;
     private final BasicDMNToNativeTransformer<Type, DMNContext> dmnTransformer;
     private final ELTranslator<Type, DMNContext> feelTranslator;
     private FEELToTripleNativeVisitor nativeVisitor;
@@ -53,8 +52,8 @@ public FEELToTripleNativeVisitorTest() {
 
     @Test
     public void testArithmeticExpression() {
-        BigDecimal a = this.lib.number("1");
-        BigDecimal b = this.lib.number("2");
+        Number a = this.lib.number("1");
+        Number b = this.lib.number("2");
         String s1 = "a";
         String s2 = "b";
         List<EnvironmentEntry> entries = Arrays.asList(
diff --git a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL2DMNInterpreterTest.java b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL2DMNInterpreterTest.java
index 29ae46c9a..8772693e4 100644
--- a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL2DMNInterpreterTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL2DMNInterpreterTest.java
@@ -16,14 +16,13 @@
 import com.gs.dmn.dialect.JavaTimeDMNDialectDefinition;
 import com.gs.dmn.tck.ast.TestCases;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class CL2DMNInterpreterTest extends AbstractCL2SDMNInterpreterTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class CL2DMNInterpreterTest extends AbstractCL2SDMNInterpreterTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> getDialectDefinition() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> getDialectDefinition() {
         return new JavaTimeDMNDialectDefinition();
     }
 }
diff --git a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL3DMNInterpreterTest.java b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL3DMNInterpreterTest.java
index 6fb165832..35d2d4ebd 100644
--- a/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL3DMNInterpreterTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/runtime/interpreter/CL3DMNInterpreterTest.java
@@ -16,14 +16,13 @@
 import com.gs.dmn.dialect.JavaTimeDMNDialectDefinition;
 import com.gs.dmn.tck.ast.TestCases;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class CL3DMNInterpreterTest extends AbstractCL3DMNInterpreterTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class CL3DMNInterpreterTest extends AbstractCL3DMNInterpreterTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> getDialectDefinition() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> getDialectDefinition() {
         return new JavaTimeDMNDialectDefinition();
     }
 
diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/AbstractTestCasesToPythonJUnitTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/AbstractTestCasesToPythonJUnitTransformerTest.java
index 4e84ca357..5d0666742 100644
--- a/dmn-core/src/test/java/com/gs/dmn/tck/AbstractTestCasesToPythonJUnitTransformerTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/tck/AbstractTestCasesToPythonJUnitTransformerTest.java
@@ -21,25 +21,24 @@
 import com.gs.dmn.transformation.template.PythonTreeTemplateProvider;
 import com.gs.dmn.transformation.template.TemplateProvider;
 
-import java.math.BigDecimal;
 import java.nio.file.Path;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public abstract class AbstractTestCasesToPythonJUnitTransformerTest extends AbstractTCKTestCasesToJUnitTransformerTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public abstract class AbstractTestCasesToPythonJUnitTransformerTest extends AbstractTCKTestCasesToJUnitTransformerTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
     protected FileTransformer makeTransformer(Path inputModelPath, InputParameters inputParameters, BuildLogger logger) {
         return new TCKTestCasesToPythonJUnitTransformer<>(makeDialectDefinition(), makeDMNValidator(logger), makeDMNTransformer(logger), makeTemplateProvider(), makeLazyEvaluationDetector(inputParameters, LOGGER), makeTypeDeserializationConfigurer(logger), inputModelPath, inputParameters, logger);
     }
 
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
         return new JavaTimePythonStandardDMNDialectDefinition();
     }
 
     @Override
-    protected TemplateProvider makeTemplateProvider(){
+    protected TemplateProvider makeTemplateProvider() {
         return new PythonTreeTemplateProvider();
     }
 }
diff --git a/dmn-core/src/test/java/com/gs/dmn/tck/MockTCKValueTranslatorTest.java b/dmn-core/src/test/java/com/gs/dmn/tck/MockTCKValueTranslatorTest.java
index 25f054b74..c57adb31a 100644
--- a/dmn-core/src/test/java/com/gs/dmn/tck/MockTCKValueTranslatorTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/tck/MockTCKValueTranslatorTest.java
@@ -50,6 +50,7 @@
 
 public class MockTCKValueTranslatorTest {
     static final DatatypeFactory DATATYPE_FACTORY;
+
     static {
         try {
             DATATYPE_FACTORY = DatatypeFactory.newInstance();
@@ -61,8 +62,8 @@ public class MockTCKValueTranslatorTest {
     private final JavaTimeDMNDialectDefinition dialect = new JavaTimeDMNDialectDefinition();
     private final DMNModelRepository repository = new DMNModelRepository();
     private final BasicDMNToNativeTransformer<Type, DMNContext> transformer = dialect.createBasicTransformer(repository, new NopLazyEvaluationDetector(), new InputParameters());
-    private final StandardFEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> lib = (StandardFEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount>) dialect.createFEELLib();
-    private final MockTCKValueTranslator<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> translator = new MockTCKValueTranslator<>(transformer, lib);
+    private final StandardFEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> lib = (StandardFEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount>) dialect.createFEELLib();
+    private final MockTCKValueTranslator<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> translator = new MockTCKValueTranslator<>(transformer, lib);
 
     @Test
     public void testWhenValueIsNil() {
@@ -166,7 +167,7 @@ private ValueType makeSimpleValue(Object value) {
 
     private ValueType makeListValue(Object... values) {
         ValueType result = new ValueType();
-        List value  = new List();
+        List value = new List();
         for (Object v: values) {
             value.getItem().add(makeSimpleValue(v));
         }
diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToJavaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToJavaTransformerTest.java
index 222eaf4ff..f0f8a61b2 100644
--- a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToJavaTransformerTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToJavaTransformerTest.java
@@ -14,21 +14,17 @@
 
 import com.gs.dmn.dialect.DMNDialectDefinition;
 import com.gs.dmn.dialect.JavaTimeDMNDialectDefinition;
-import com.gs.dmn.dialect.StandardDMNDialectDefinition;
 import com.gs.dmn.tck.ast.TestCases;
 import com.gs.dmn.transformation.template.TemplateProvider;
 import com.gs.dmn.transformation.template.TreeTemplateProvider;
 
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public abstract class AbstractTckDMNToJavaTransformerTest extends AbstractTckDMNToNativeTransformerTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public abstract class AbstractTckDMNToJavaTransformerTest extends AbstractTckDMNToNativeTransformerTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
         return new JavaTimeDMNDialectDefinition();
     }
 
diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToKotlinTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToKotlinTransformerTest.java
index 0b385a5bc..9461f91a7 100644
--- a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToKotlinTransformerTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToKotlinTransformerTest.java
@@ -14,21 +14,17 @@
 
 import com.gs.dmn.dialect.DMNDialectDefinition;
 import com.gs.dmn.dialect.JavaTimeKotlinStandardDMNDialectDefinition;
-import com.gs.dmn.dialect.KotlinStandardDMNDialectDefinition;
 import com.gs.dmn.tck.ast.TestCases;
 import com.gs.dmn.transformation.template.KotlinTreeTemplateProvider;
 import com.gs.dmn.transformation.template.TemplateProvider;
 
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public abstract class AbstractTckDMNToKotlinTransformerTest extends AbstractTckDMNToNativeTransformerTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public abstract class AbstractTckDMNToKotlinTransformerTest extends AbstractTckDMNToNativeTransformerTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
         return new JavaTimeKotlinStandardDMNDialectDefinition();
     }
 
diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToPythonTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToPythonTransformerTest.java
index 12eaf5bf0..d90668d4e 100644
--- a/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToPythonTransformerTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/transformation/AbstractTckDMNToPythonTransformerTest.java
@@ -18,14 +18,13 @@
 import com.gs.dmn.transformation.template.PythonTreeTemplateProvider;
 import com.gs.dmn.transformation.template.TemplateProvider;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public abstract class AbstractTckDMNToPythonTransformerTest extends AbstractTckDMNToNativeTransformerTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public abstract class AbstractTckDMNToPythonTransformerTest extends AbstractTckDMNToNativeTransformerTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
+    protected DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> makeDialectDefinition() {
         return new JavaTimePythonStandardDMNDialectDefinition();
     }
 
diff --git a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java
index dbd8de94e..c1b13ec17 100644
--- a/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java
+++ b/dmn-core/src/test/java/com/gs/dmn/transformation/CL3DMNToLambdaTransformerTest.java
@@ -50,7 +50,7 @@ protected String getExpectedPath() {
     @Override
     protected FileTransformer makeTransformer(InputParameters inputParameters, BuildLogger logger) {
         // Create transformer
-        DMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> dmnDialect = makeDialectDefinition();
+        DMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount, TestCases> dmnDialect = makeDialectDefinition();
         DMNValidator dmnValidator = makeDMNValidator(logger);
         DMNTransformer<TestCases> dmnTransformer = makeDMNTransformer(logger);
         TemplateProvider templateProvider = makeTemplateProvider();
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/DefaultFEELLib.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/DefaultFEELLib.java
index af7050dcd..0eebd49e3 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/DefaultFEELLib.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/DefaultFEELLib.java
@@ -24,8 +24,8 @@
 import com.gs.dmn.feel.lib.type.list.DefaultListType;
 import com.gs.dmn.feel.lib.type.list.ListLib;
 import com.gs.dmn.feel.lib.type.list.ListType;
-import com.gs.dmn.feel.lib.type.numeric.DefaultNumericLib;
-import com.gs.dmn.feel.lib.type.numeric.DefaultNumericType;
+import com.gs.dmn.feel.lib.type.numeric.DecimalNumericLib;
+import com.gs.dmn.feel.lib.type.numeric.DecimalNumericType;
 import com.gs.dmn.feel.lib.type.numeric.NumericLib;
 import com.gs.dmn.feel.lib.type.numeric.NumericType;
 import com.gs.dmn.feel.lib.type.range.DefaultRangeLib;
@@ -44,11 +44,11 @@
 import java.math.BigDecimal;
 
 /**
- * @deprecated  As of release 8.3.0, replaced by {@link JavaTimeFEELLib}
+ * @deprecated As of release 8.3.0, replaced by {@link JavaTimeFEELLib}
  */
 @Deprecated
 public class DefaultFEELLib extends BaseStandardFEELLib<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregorianCalendar, Duration> {
-    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DefaultNumericType();
+    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DecimalNumericType();
     private static final BooleanType BOOLEAN_TYPE = new DefaultBooleanType();
     private static final StringType STRING_TYPE = new DefaultStringType();
     private static final DateType<XMLGregorianCalendar, Duration> DATE_TYPE = new DefaultDateType();
@@ -60,7 +60,7 @@ public class DefaultFEELLib extends BaseStandardFEELLib<BigDecimal, XMLGregorian
     private static final RangeType RANGE_TYPE = new DefaultRangeType();
     private static final FunctionType FUNCTION_TYPE = new DefaultFunctionType();
 
-    private static final NumericLib<BigDecimal> NUMERIC_LIB = new DefaultNumericLib();
+    private static final NumericLib<BigDecimal> NUMERIC_LIB = new DecimalNumericLib();
     private static final StringLib STRING_LIB = new DefaultStringLib();
     private static final BooleanLib BOOLEAN_LIB = new DefaultBooleanLib();
     private static final DateTimeLib<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregorianCalendar, Duration> DATE_TIME_LIB = new DefaultDateTimeLib();
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/JavaTimeFEELLib.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/JavaTimeFEELLib.java
index cd2d4dec5..7455182df 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/JavaTimeFEELLib.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/JavaTimeFEELLib.java
@@ -44,14 +44,14 @@
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimeFEELLib extends BaseStandardFEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
-    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DefaultNumericType();
+public class JavaTimeFEELLib extends BaseStandardFEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+    private static final NumericType<Number> NUMERIC_TYPE = new DefaultNumericType();
     private static final BooleanType BOOLEAN_TYPE = new DefaultBooleanType();
     private static final StringType STRING_TYPE = new DefaultStringType();
     private static final DateType<LocalDate, TemporalAmount> DATE_TYPE = new LocalDateType();
     private static final TimeType<TemporalAccessor, TemporalAmount> TIME_TYPE = new TemporalTimeType();
     private static final DateTimeType<TemporalAccessor, TemporalAmount> DATE_TIME_TYPE = new TemporalDateTimeType();
-    private static final DurationType<TemporalAmount, BigDecimal> DURATION_TYPE = new TemporalAmountDurationType();
+    private static final DurationType<TemporalAmount, Number> DURATION_TYPE = new TemporalAmountDurationType();
     private static final ListType LIST_TYPE = new DefaultListType();
     private static final ContextType CONTEXT_TYPE = new DefaultContextType();
     private static final RangeType RANGE_TYPE = new DefaultRangeType();
@@ -90,18 +90,18 @@ public JavaTimeFEELLib() {
     }
 
     protected JavaTimeFEELLib(
-            NumericType<BigDecimal> numericType,
+            NumericType<Number> numericType,
             BooleanType booleanType,
             StringType stringType,
             DateType<LocalDate, TemporalAmount> dateType,
             TimeType<TemporalAccessor, TemporalAmount> timeType,
             DateTimeType<TemporalAccessor, TemporalAmount> dateTimeType,
-            DurationType<TemporalAmount, BigDecimal> durationType,
+            DurationType<TemporalAmount, Number> durationType,
             ListType listType, ContextType contextType, RangeType rangeType, FunctionType functionType,
-            NumericLib<BigDecimal> numericLib,
+            NumericLib<Number> numericLib,
             StringLib stringLib,
             BooleanLib booleanLib,
-            DateTimeLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> dateTimeLib,
+            DateTimeLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> dateTimeLib,
             DurationLib<LocalDate, TemporalAmount> durationLib,
             ListLib listLib,
             RangeLib rangeLib) {
@@ -129,12 +129,12 @@ public TemporalAmount yearsAndMonthsDuration(TemporalAccessor from, TemporalAcce
     // Extra conversion functions
     //
     @Override
-    protected BigDecimal valueOf(long number) {
+    protected Number valueOf(long number) {
         return BigDecimal.valueOf(number);
     }
 
     @Override
-    protected int intValue(BigDecimal number) {
+    protected int intValue(Number number) {
         return number.intValue();
     }
 }
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/MixedJavaTimeFEELLib.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/MixedJavaTimeFEELLib.java
index 54f7ef39d..2d891d59c 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/MixedJavaTimeFEELLib.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/MixedJavaTimeFEELLib.java
@@ -18,8 +18,8 @@
 import com.gs.dmn.feel.lib.type.function.FunctionType;
 import com.gs.dmn.feel.lib.type.list.ListLib;
 import com.gs.dmn.feel.lib.type.list.ListType;
-import com.gs.dmn.feel.lib.type.numeric.DefaultNumericLib;
-import com.gs.dmn.feel.lib.type.numeric.DefaultNumericType;
+import com.gs.dmn.feel.lib.type.numeric.DecimalNumericLib;
+import com.gs.dmn.feel.lib.type.numeric.DecimalNumericType;
 import com.gs.dmn.feel.lib.type.numeric.NumericLib;
 import com.gs.dmn.feel.lib.type.numeric.NumericType;
 import com.gs.dmn.feel.lib.type.range.RangeLib;
@@ -36,13 +36,13 @@
 import java.time.ZonedDateTime;
 
 /**
- * @deprecated  As of release 8.3.0, replaced by {@link JavaTimeFEELLib}
+ * @deprecated As of release 8.3.0, replaced by {@link JavaTimeFEELLib}
  */
 @Deprecated
 public class MixedJavaTimeFEELLib extends BaseMixedJavaTimeFEELLib<BigDecimal> {
-    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DefaultNumericType();
+    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DecimalNumericType();
     private static final DurationType<Duration, BigDecimal> DURATION_TYPE = new DefaultDurationType();
-    private static final NumericLib<BigDecimal> NUMERIC_LIB = new DefaultNumericLib();
+    private static final NumericLib<BigDecimal> NUMERIC_LIB = new DecimalNumericLib();
 
     public static final MixedJavaTimeFEELLib INSTANCE = new MixedJavaTimeFEELLib();
 
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DecimalNumericLib.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DecimalNumericLib.java
new file mode 100644
index 000000000..20ca9ce21
--- /dev/null
+++ b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DecimalNumericLib.java
@@ -0,0 +1,314 @@
+/*
+ * Copyright 2016 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.gs.dmn.feel.lib.type.numeric;
+
+import com.gs.dmn.runtime.DMNRuntimeException;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+
+import static com.gs.dmn.feel.lib.type.numeric.DecimalNumericType.MATH_CONTEXT;
+
+public class DecimalNumericLib extends BaseNumericLib<BigDecimal> {
+    @Override
+    public BigDecimal number(String literal) {
+        if (StringUtils.isBlank(literal)) {
+            return null;
+        }
+
+        return new BigDecimal(literal, MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal decimal(BigDecimal n, BigDecimal scale) {
+        if (n == null || scale == null) {
+            return null;
+        }
+        checkScale(scale);
+
+        return round(n, scale, RoundingMode.HALF_EVEN);
+    }
+
+    @Override
+    public BigDecimal round(BigDecimal n, BigDecimal scale, RoundingMode mode) {
+        if (n == null || scale == null || mode == null) {
+            return null;
+        }
+        checkScale(scale);
+
+        return n.setScale(scale.intValue(), mode);
+    }
+
+    @Override
+    public BigDecimal floor(BigDecimal n, BigDecimal scale) {
+        if (n == null || scale == null) {
+            return null;
+        }
+        checkScale(scale);
+
+        return n.setScale(scale.intValue(), RoundingMode.FLOOR);
+    }
+
+    @Override
+    public BigDecimal ceiling(BigDecimal n, BigDecimal scale) {
+        if (n == null || scale == null) {
+            return null;
+        }
+        checkScale(scale);
+
+        return n.setScale(scale.intValue(), RoundingMode.CEILING);
+    }
+
+    @Override
+    public BigDecimal abs(BigDecimal n) {
+        if (n == null) {
+            return null;
+        }
+
+        return n.abs();
+    }
+
+    @Override
+    public BigDecimal intModulo(BigDecimal dividend, BigDecimal divisor) {
+        if (dividend == null || divisor == null) {
+            return null;
+        }
+
+        return new BigDecimal(dividend.toBigInteger().remainder(divisor.toBigInteger()));
+    }
+
+    @Override
+    public BigDecimal modulo(BigDecimal dividend, BigDecimal divisor) {
+        if (dividend == null || divisor == null) {
+            return null;
+        }
+
+        // dividend - divisor*floor(dividend/divisor)
+        return dividend.subtract(divisor.multiply(floor(DecimalNumericType.decimalNumericDivide(dividend, divisor), BigDecimal.ZERO)));
+    }
+
+    @Override
+    public BigDecimal sqrt(BigDecimal number) {
+        if (number == null) {
+            return null;
+        }
+
+        // TODO use method with context
+        double value = Math.sqrt(number.doubleValue());
+        return BigDecimal.valueOf(value);
+    }
+
+    @Override
+    public BigDecimal log(BigDecimal number) {
+        if (number == null) {
+            return null;
+        }
+
+        double value = Math.log(number.doubleValue());
+        return BigDecimal.valueOf(value);
+    }
+
+    @Override
+    public BigDecimal exp(BigDecimal number) {
+        if (number == null) {
+            return null;
+        }
+
+        double value = Math.exp(number.doubleValue());
+        return BigDecimal.valueOf(value);
+    }
+
+    @Override
+    public Boolean odd(BigDecimal number) {
+        if (!isIntegerValue(number)) {
+            return null;
+        }
+
+        return number.intValue() % 2 != 0;
+    }
+
+    @Override
+    public Boolean even(BigDecimal number) {
+        if (!isIntegerValue(number)) {
+            return null;
+        }
+
+        return number.intValue() % 2 == 0;
+    }
+
+    private boolean isIntegerValue(BigDecimal bd) {
+        return bd != null && bd.stripTrailingZeros().scale() <= 0;
+    }
+
+    //
+    // List functions
+    //
+    @Override
+    public BigDecimal count(List<?> list) {
+        return list == null ? BigDecimal.valueOf(0) : BigDecimal.valueOf(list.size());
+    }
+
+    @Override
+    public BigDecimal min(List<?> list) {
+        if (list == null || list.isEmpty()) {
+            return null;
+        }
+
+        BigDecimal result = (BigDecimal) list.get(0);
+        for (int i = 1; i < list.size(); i++) {
+            BigDecimal x = (BigDecimal) list.get(i);
+            if (result.compareTo(x) > 0) {
+                result = x;
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public BigDecimal max(List<?> list) {
+        if (list == null || list.isEmpty()) {
+            return null;
+        }
+
+        BigDecimal result = (BigDecimal) list.get(0);
+        for (int i = 1; i < list.size(); i++) {
+            BigDecimal x = (BigDecimal) list.get(i);
+            if (result.compareTo(x) < 0) {
+                result = x;
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public BigDecimal sum(List<?> list) {
+        if (list == null || list.isEmpty()) {
+            return null;
+        }
+
+        BigDecimal result = BigDecimal.valueOf(0);
+        for (Object e : list) {
+            BigDecimal number = (BigDecimal) e;
+            result = result.add(number);
+        }
+        return result;
+    }
+
+    @Override
+    public BigDecimal mean(List<?> list) {
+        if (list == null) {
+            return null;
+        }
+
+        BigDecimal sum = sum(list);
+        return DecimalNumericType.decimalNumericDivide(sum, BigDecimal.valueOf(list.size()));
+    }
+
+    @Override
+    public BigDecimal product(List<?> list) {
+        if (list == null || list.isEmpty()) {
+            return null;
+        }
+
+        BigDecimal result = BigDecimal.valueOf(1);
+        for (Object e : list) {
+            BigDecimal number = (BigDecimal) e;
+            result = result.multiply(number);
+        }
+        return result;
+    }
+
+    @Override
+    public BigDecimal median(List<?> list) {
+        if (list == null || list.isEmpty()) {
+            return null;
+        }
+
+        Collections.sort((List<BigDecimal>) list);
+        BigDecimal median;
+        int size = list.size();
+        if (size % 2 == 0) {
+            BigDecimal first = (BigDecimal) list.get(size / 2);
+            BigDecimal second = (BigDecimal) list.get(size / 2 - 1);
+            median = first.add(second).divide(BigDecimal.valueOf(2));
+        } else {
+            median = (BigDecimal) list.get(size / 2);
+        }
+        return median;
+    }
+
+    @Override
+    public BigDecimal stddev(List<?> list) {
+        if (list == null || list.isEmpty()) {
+            return null;
+        }
+
+        BigDecimal mean = mean(list);
+        BigDecimal length = BigDecimal.valueOf((long) list.size() - 1);
+        BigDecimal variance = BigDecimal.ZERO;
+        for (Object e : list) {
+            BigDecimal number = (BigDecimal) e;
+            BigDecimal dm = number.subtract(mean);
+            BigDecimal dv = dm.multiply(dm);
+            variance = variance.add(dv);
+        }
+        variance = variance.divide(length, MATH_CONTEXT);
+        BigDecimal stddev = sqrt(variance);
+        return stddev;
+    }
+
+    @Override
+    public List mode(List<?> list) {
+        if (list == null) {
+            return null;
+        }
+        if (list.isEmpty()) {
+            return new ArrayList();
+        }
+
+        int max = -1;
+        List modes = new ArrayList();
+        Map<Object, Integer> countMap = new HashMap<>();
+        for (Object n : list) {
+            if (!(n instanceof Number)) {
+                return null;
+            }
+            int count = countMap.compute(n, (k, v) -> v == null ? 1 : v + 1);
+            if (count > max) {
+                max = count;
+            }
+        }
+
+        for (Map.Entry<Object, Integer> tuple : countMap.entrySet()) {
+            if (tuple.getValue() == max) {
+                modes.add(tuple.getKey());
+            }
+        }
+
+        Collections.sort(modes);
+        return modes;
+    }
+
+    @Override
+    public Number toNumber(BigDecimal number) {
+        return number;
+    }
+
+    private void checkScale(BigDecimal scale) {
+        if (scale != null && (scale.intValue() < MIN_SCALE || scale.intValue() > MAX_SCALE)) {
+            throw new DMNRuntimeException(String.format("Scale '%s' not in range [%s, %s]", scale, MIN_SCALE, MAX_SCALE));
+        }
+    }
+}
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DecimalNumericType.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DecimalNumericType.java
new file mode 100644
index 000000000..154938f08
--- /dev/null
+++ b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DecimalNumericType.java
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2016 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.gs.dmn.feel.lib.type.numeric;
+
+import com.gs.dmn.feel.lib.type.ComparableComparator;
+
+import java.math.BigDecimal;
+import java.math.MathContext;
+
+public class DecimalNumericType extends BaseNumericType implements NumericType<BigDecimal> {
+    public static final MathContext MATH_CONTEXT = MathContext.DECIMAL128;
+
+    public static BigDecimal decimalNumericDivide(BigDecimal first, BigDecimal second) {
+        if (first == null || second == null) {
+            return null;
+        }
+        if (BigDecimal.ZERO.equals(second)) {
+            return null;
+        }
+
+        return first.divide(second, MATH_CONTEXT);
+    }
+
+    private final ComparableComparator<BigDecimal> comparator;
+
+    public DecimalNumericType() {
+        this(new ComparableComparator<>());
+    }
+
+    public DecimalNumericType(ComparableComparator<BigDecimal> comparator) {
+        this.comparator = comparator;
+    }
+
+    @Override
+    public boolean isNumber(Object value) {
+        return value instanceof BigDecimal;
+    }
+
+    @Override
+    public BigDecimal numericValue(BigDecimal value) {
+        return value;
+    }
+
+    @Override
+    public Boolean numericIs(BigDecimal first, BigDecimal second) {
+        if (first == null || second == null) {
+            return first == second;
+        }
+
+        return first.unscaledValue().equals(second.unscaledValue())
+                && first.scale() == second.scale();
+    }
+
+    @Override
+    public Boolean numericEqual(BigDecimal first, BigDecimal second) {
+        return this.comparator.equalTo(first, second);
+    }
+
+    @Override
+    public Boolean numericNotEqual(BigDecimal first, BigDecimal second) {
+        return this.comparator.notEqualTo(first, second);
+    }
+
+    @Override
+    public Boolean numericLessThan(BigDecimal first, BigDecimal second) {
+        return this.comparator.lessThan(first, second);
+    }
+
+    @Override
+    public Boolean numericGreaterThan(BigDecimal first, BigDecimal second) {
+        return this.comparator.greaterThan(first, second);
+    }
+
+    @Override
+    public Boolean numericLessEqualThan(BigDecimal first, BigDecimal second) {
+        return this.comparator.lessEqualThan(first, second);
+    }
+
+    @Override
+    public Boolean numericGreaterEqualThan(BigDecimal first, BigDecimal second) {
+        return this.comparator.greaterEqualThan(first, second);
+    }
+
+    @Override
+    public BigDecimal numericAdd(BigDecimal first, BigDecimal second) {
+        if (first == null || second == null) {
+            return null;
+        }
+
+        return first.add(second, MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal numericSubtract(BigDecimal first, BigDecimal second) {
+        if (first == null || second == null) {
+            return null;
+        }
+
+        return first.subtract(second, MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal numericMultiply(BigDecimal first, BigDecimal second) {
+        if (first == null || second == null) {
+            return null;
+        }
+
+        return first.multiply(second, MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal numericDivide(BigDecimal first, BigDecimal second) {
+        return decimalNumericDivide(first, second);
+    }
+
+    @Override
+    public BigDecimal numericUnaryMinus(BigDecimal first) {
+        if (first == null) {
+            return null;
+        }
+
+        return first.negate(MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal numericExponentiation(BigDecimal first, BigDecimal second) {
+        if (first == null || second == null) {
+            return null;
+        }
+
+        if (second.remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) == 0) {
+            return numericExponentiation(first, second.intValue());
+        } else {
+            return BigDecimal.valueOf(Math.pow(first.doubleValue(), second.doubleValue()));
+        }
+    }
+
+    public BigDecimal numericExponentiation(BigDecimal first, int second) {
+        if (first == null) {
+            return null;
+        }
+
+        if (second < 0) {
+            return first.pow(second, MATH_CONTEXT);
+        } else if (second == 0) {
+            return BigDecimal.ONE;
+        } else {
+            BigDecimal temp = first.pow(-second, MATH_CONTEXT);
+            return BigDecimal.ONE.divide(temp, MATH_CONTEXT);
+        }
+    }
+}
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DefaultNumericLib.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DefaultNumericLib.java
index f64b3d68c..408c2c03d 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DefaultNumericLib.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DefaultNumericLib.java
@@ -12,303 +12,129 @@
  */
 package com.gs.dmn.feel.lib.type.numeric;
 
-import com.gs.dmn.runtime.DMNRuntimeException;
-import org.apache.commons.lang3.StringUtils;
-
-import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.*;
-
-import static com.gs.dmn.feel.lib.type.numeric.DefaultNumericType.MATH_CONTEXT;
+import java.util.List;
 
-public class DefaultNumericLib extends BaseNumericLib<BigDecimal> {
-    @Override
-    public BigDecimal number(String literal) {
-        if (StringUtils.isBlank(literal)) {
-            return null;
-        }
+import static com.gs.dmn.feel.lib.type.numeric.DefaultNumericType.toDecimal;
 
-        return new BigDecimal(literal, MATH_CONTEXT);
-    }
+public class DefaultNumericLib extends BaseNumericLib<Number> {
+    private static final DecimalNumericLib DECIMAL_NUMERIC_LIB = new DecimalNumericLib();
 
     @Override
-    public BigDecimal decimal(BigDecimal n, BigDecimal scale) {
-        if (n == null || scale == null) {
-            return null;
-        }
-        checkScale(scale);
-
-        return round(n, scale, RoundingMode.HALF_EVEN);
+    public Number number(String literal) {
+        return DECIMAL_NUMERIC_LIB.number(literal);
     }
 
     @Override
-    public BigDecimal round(BigDecimal n, BigDecimal scale, RoundingMode mode) {
-        if (n == null || scale == null || mode == null) {
-            return null;
-        }
-        checkScale(scale);
-
-        return n.setScale(scale.intValue(), mode);
+    public Number decimal(Number n, Number scale) {
+        return DECIMAL_NUMERIC_LIB.decimal(toDecimal(n), toDecimal(scale));
     }
 
     @Override
-    public BigDecimal floor(BigDecimal n, BigDecimal scale) {
-        if (n == null || scale == null) {
-            return null;
-        }
-        checkScale(scale);
-
-        return n.setScale(scale.intValue(), RoundingMode.FLOOR);
+    public Number round(Number n, Number scale, RoundingMode mode) {
+        return DECIMAL_NUMERIC_LIB.round(toDecimal(n), toDecimal(scale), mode);
     }
 
     @Override
-    public BigDecimal ceiling(BigDecimal n, BigDecimal scale) {
-        if (n == null || scale == null) {
-            return null;
-        }
-        checkScale(scale);
-
-        return n.setScale(scale.intValue(), RoundingMode.CEILING);
+    public Number floor(Number n, Number scale) {
+        return DECIMAL_NUMERIC_LIB.floor(toDecimal(n), toDecimal(scale));
     }
 
     @Override
-    public BigDecimal abs(BigDecimal n) {
-        if (n == null) {
-            return null;
-        }
-
-        return n.abs();
+    public Number ceiling(Number n, Number scale) {
+        return DECIMAL_NUMERIC_LIB.ceiling(toDecimal(n), toDecimal(scale));
     }
 
     @Override
-    public BigDecimal intModulo(BigDecimal dividend, BigDecimal divisor) {
-        if (dividend == null || divisor == null) {
-            return null;
-        }
-
-        return new BigDecimal(dividend.toBigInteger().remainder(divisor.toBigInteger()));
+    public Number abs(Number n) {
+        return DECIMAL_NUMERIC_LIB.abs(toDecimal(n));
     }
 
     @Override
-    public BigDecimal modulo(BigDecimal dividend, BigDecimal divisor) {
-        if (dividend == null || divisor == null) {
-            return null;
-        }
-
-        // dividend - divisor*floor(dividend/divisor)
-        return dividend.subtract(divisor.multiply(floor(DefaultNumericType.decimalNumericDivide(dividend, divisor), BigDecimal.ZERO)));
+    public Number intModulo(Number dividend, Number divisor) {
+        return DECIMAL_NUMERIC_LIB.intModulo(toDecimal(dividend), toDecimal(divisor));
     }
 
     @Override
-    public BigDecimal sqrt(BigDecimal number) {
-        if (number == null) {
-            return null;
-        }
-
-        // TODO use method with context
-        double value = Math.sqrt(number.doubleValue());
-        return BigDecimal.valueOf(value);
+    public Number modulo(Number dividend, Number divisor) {
+        return DECIMAL_NUMERIC_LIB.modulo(toDecimal(dividend), toDecimal(divisor));
     }
 
     @Override
-    public BigDecimal log(BigDecimal number) {
-        if (number == null) {
-            return null;
-        }
-
-        double value = Math.log(number.doubleValue());
-        return BigDecimal.valueOf(value);
+    public Number sqrt(Number number) {
+        return DECIMAL_NUMERIC_LIB.sqrt(toDecimal(number));
     }
 
     @Override
-    public BigDecimal exp(BigDecimal number) {
-        if (number == null) {
-            return null;
-        }
-
-        double value = Math.exp(number.doubleValue());
-        return BigDecimal.valueOf(value);
+    public Number log(Number number) {
+        return DECIMAL_NUMERIC_LIB.log(toDecimal(number));
     }
 
     @Override
-    public Boolean odd(BigDecimal number) {
-        if (!isIntegerValue(number)) {
-            return null;
-        }
-
-        return number.intValue() % 2 != 0;
+    public Number exp(Number number) {
+        return DECIMAL_NUMERIC_LIB.exp(toDecimal(number));
     }
 
     @Override
-    public Boolean even(BigDecimal number) {
-        if (!isIntegerValue(number)) {
-            return null;
-        }
-
-        return number.intValue() % 2 == 0;
+    public Boolean odd(Number number) {
+        return DECIMAL_NUMERIC_LIB.odd(toDecimal(number));
     }
 
-    private boolean isIntegerValue(BigDecimal bd) {
-        return bd != null && bd.stripTrailingZeros().scale() <= 0;
+    @Override
+    public Boolean even(Number number) {
+        return DECIMAL_NUMERIC_LIB.even(toDecimal(number));
     }
 
     //
     // List functions
     //
     @Override
-    public BigDecimal count(List<?> list) {
-        return list == null ? BigDecimal.valueOf(0) : BigDecimal.valueOf(list.size());
+    public Number count(List<?> list) {
+        return DECIMAL_NUMERIC_LIB.count(list);
     }
 
     @Override
-    public BigDecimal min(List<?> list) {
-        if (list == null || list.isEmpty()) {
-            return null;
-        }
-
-        BigDecimal result = (BigDecimal) list.get(0);
-        for (int i = 1; i < list.size(); i++) {
-            BigDecimal x = (BigDecimal) list.get(i);
-            if (result.compareTo(x) > 0) {
-                result = x;
-            }
-        }
-        return result;
+    public Number min(List<?> list) {
+        return DECIMAL_NUMERIC_LIB.min(list);
     }
 
     @Override
-    public BigDecimal max(List<?> list) {
-        if (list == null || list.isEmpty()) {
-            return null;
-        }
-
-        BigDecimal result = (BigDecimal) list.get(0);
-        for (int i = 1; i < list.size(); i++) {
-            BigDecimal x = (BigDecimal) list.get(i);
-            if (result.compareTo(x) < 0) {
-                result = x;
-            }
-        }
-        return result;
+    public Number max(List<?> list) {
+        return DECIMAL_NUMERIC_LIB.max(list);
     }
 
     @Override
-    public BigDecimal sum(List<?> list) {
-        if (list == null || list.isEmpty()) {
-            return null;
-        }
-
-        BigDecimal result = BigDecimal.valueOf(0);
-        for (Object e : list) {
-            BigDecimal number = (BigDecimal) e;
-            result = result.add(number);
-        }
-        return result;
+    public Number sum(List<?> list) {
+        return DECIMAL_NUMERIC_LIB.sum(list);
     }
 
     @Override
-    public BigDecimal mean(List<?> list) {
-        if (list == null) {
-            return null;
-        }
-
-        BigDecimal sum = sum(list);
-        return DefaultNumericType.decimalNumericDivide(sum, BigDecimal.valueOf(list.size()));
+    public Number mean(List<?> list) {
+        return DECIMAL_NUMERIC_LIB.mean(list);
     }
 
     @Override
-    public BigDecimal product(List<?> list) {
-        if (list == null || list.isEmpty()) {
-            return null;
-        }
-
-        BigDecimal result = BigDecimal.valueOf(1);
-        for (Object e : list) {
-            BigDecimal number = (BigDecimal) e;
-            result = result.multiply(number);
-        }
-        return result;
+    public Number product(List<?> list) {
+        return DECIMAL_NUMERIC_LIB.product(list);
     }
 
     @Override
-    public BigDecimal median(List<?> list) {
-        if (list == null || list.isEmpty()) {
-            return null;
-        }
-
-        Collections.sort((List<BigDecimal>)list);
-        BigDecimal median;
-        int size = list.size();
-        if (size % 2 == 0) {
-            BigDecimal first = (BigDecimal) list.get(size / 2);
-            BigDecimal second = (BigDecimal) list.get(size / 2 - 1);
-            median = first.add(second).divide(BigDecimal.valueOf(2));
-        } else {
-            median = (BigDecimal) list.get(size / 2);
-        }
-        return median;
+    public Number median(List<?> list) {
+        return DECIMAL_NUMERIC_LIB.median(list);
     }
 
     @Override
-    public BigDecimal stddev(List<?> list) {
-        if (list == null || list.isEmpty()) {
-            return null;
-        }
-
-        BigDecimal mean = mean(list);
-        BigDecimal length = BigDecimal.valueOf((long) list.size() - 1);
-        BigDecimal variance = BigDecimal.ZERO;
-        for(Object e: list) {
-            BigDecimal number = (BigDecimal) e;
-            BigDecimal dm = number.subtract(mean);
-            BigDecimal dv = dm.multiply(dm);
-            variance = variance.add(dv);
-        }
-        variance = variance.divide(length, MATH_CONTEXT);
-        BigDecimal stddev = sqrt(variance);
-        return stddev;
+    public Number stddev(List<?> list) {
+        return DECIMAL_NUMERIC_LIB.stddev(list);
     }
 
     @Override
     public List mode(List<?> list) {
-        if (list == null) {
-            return null;
-        }
-        if (list.isEmpty()) {
-            return new ArrayList();
-        }
-
-        int max = -1;
-        List modes = new ArrayList();
-        Map<Object, Integer> countMap = new HashMap<>();
-        for (Object n : list) {
-            if (! (n instanceof Number)) {
-                return null;
-            }
-            int count = countMap.compute(n, (k, v) -> v == null ? 1 : v + 1);
-            if (count > max) {
-                max = count;
-            }
-        }
-
-        for (Map.Entry<Object, Integer> tuple : countMap.entrySet()) {
-            if (tuple.getValue() == max) {
-                modes.add(tuple.getKey());
-            }
-        }
-
-        Collections.sort(modes);
-        return modes;
+        return DECIMAL_NUMERIC_LIB.mode(list);
     }
 
     @Override
-    public Number toNumber(BigDecimal number) {
-        return number;
-    }
-
-    private void checkScale(BigDecimal scale) {
-        if (scale != null && (scale.intValue() < MIN_SCALE || scale.intValue() > MAX_SCALE)) {
-            throw new DMNRuntimeException(String.format("Scale '%s' not in range [%s, %s]", scale, MIN_SCALE, MAX_SCALE));
-        }
+    public Number toNumber(Number number) {
+        return DECIMAL_NUMERIC_LIB.toNumber(toDecimal(number));
     }
 }
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DefaultNumericType.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DefaultNumericType.java
index 2c3d4f812..4b837822b 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DefaultNumericType.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/numeric/DefaultNumericType.java
@@ -12,151 +12,100 @@
  */
 package com.gs.dmn.feel.lib.type.numeric;
 
-import com.gs.dmn.feel.lib.type.ComparableComparator;
+import com.gs.dmn.runtime.DMNRuntimeException;
 
 import java.math.BigDecimal;
-import java.math.MathContext;
 
-public class DefaultNumericType extends BaseNumericType implements NumericType<BigDecimal> {
-    public static final MathContext MATH_CONTEXT = MathContext.DECIMAL128;
+public class DefaultNumericType extends BaseNumericType implements NumericType<Number> {
+    private static final DecimalNumericType DECIMAL_NUMERIC_TYPE = new DecimalNumericType();
 
-    public static BigDecimal decimalNumericDivide(BigDecimal first, BigDecimal second) {
-        if (first == null || second == null) {
+    public static BigDecimal toDecimal(Number number) {
+        if (number == null) {
             return null;
+        } else if (number instanceof BigDecimal) {
+            return (BigDecimal) number;
+        } else if (number instanceof Short || number instanceof Integer) {
+            return BigDecimal.valueOf(number.intValue());
+        } else if (number instanceof Long) {
+            return BigDecimal.valueOf(number.longValue());
+        } else if (number instanceof Double) {
+            return BigDecimal.valueOf(number.doubleValue());
         }
-        if (BigDecimal.ZERO.equals(second)) {
-            return null;
-        }
-
-        return first.divide(second, MATH_CONTEXT);
-    }
-
-    private final ComparableComparator<BigDecimal> comparator;
-
-    public DefaultNumericType() {
-        this(new ComparableComparator<>());
-    }
-
-    public DefaultNumericType(ComparableComparator<BigDecimal> comparator) {
-        this.comparator = comparator;
+        throw new DMNRuntimeException(String.format("Not supported conversion of '%s' to decimal", number));
     }
 
     @Override
     public boolean isNumber(Object value) {
-        return value instanceof BigDecimal;
+        return DECIMAL_NUMERIC_TYPE.isNumber(value);
     }
 
     @Override
-    public BigDecimal numericValue(BigDecimal value) {
-        return value;
+    public Number numericValue(Number value) {
+        return DECIMAL_NUMERIC_TYPE.numericValue(toDecimal(value));
     }
 
     @Override
-    public Boolean numericIs(BigDecimal first, BigDecimal second) {
-        if (first == null || second == null) {
-            return first == second;
-        }
-
-        return first.unscaledValue().equals(second.unscaledValue())
-                && first.scale() == second.scale();
+    public Boolean numericIs(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericIs(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public Boolean numericEqual(BigDecimal first, BigDecimal second) {
-        return this.comparator.equalTo(first, second);
+    public Boolean numericEqual(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericEqual(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public Boolean numericNotEqual(BigDecimal first, BigDecimal second) {
-        return this.comparator.notEqualTo(first, second);
+    public Boolean numericNotEqual(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericNotEqual(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public Boolean numericLessThan(BigDecimal first, BigDecimal second) {
-        return this.comparator.lessThan(first, second);
+    public Boolean numericLessThan(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericLessThan(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public Boolean numericGreaterThan(BigDecimal first, BigDecimal second) {
-        return this.comparator.greaterThan(first, second);
+    public Boolean numericGreaterThan(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericGreaterThan(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public Boolean numericLessEqualThan(BigDecimal first, BigDecimal second) {
-        return this.comparator.lessEqualThan(first, second);
+    public Boolean numericLessEqualThan(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericLessEqualThan(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public Boolean numericGreaterEqualThan(BigDecimal first, BigDecimal second) {
-        return this.comparator.greaterEqualThan(first, second);
+    public Boolean numericGreaterEqualThan(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericGreaterEqualThan(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public BigDecimal numericAdd(BigDecimal first, BigDecimal second) {
-        if (first == null || second == null) {
-            return null;
-        }
-
-        return first.add(second, MATH_CONTEXT);
+    public Number numericAdd(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericAdd(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public BigDecimal numericSubtract(BigDecimal first, BigDecimal second) {
-        if (first == null || second == null) {
-            return null;
-        }
-
-        return first.subtract(second, MATH_CONTEXT);
+    public Number numericSubtract(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericSubtract(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public BigDecimal numericMultiply(BigDecimal first, BigDecimal second) {
-        if (first == null || second == null) {
-            return null;
-        }
-
-        return first.multiply(second, MATH_CONTEXT);
+    public Number numericMultiply(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericMultiply(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public BigDecimal numericDivide(BigDecimal first, BigDecimal second) {
-        return decimalNumericDivide(first, second);
+    public Number numericDivide(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericDivide(toDecimal(first), toDecimal(second));
     }
 
     @Override
-    public BigDecimal numericUnaryMinus(BigDecimal first) {
-        if (first == null) {
-            return null;
-        }
-
-        return first.negate(MATH_CONTEXT);
+    public Number numericUnaryMinus(Number first) {
+        return DECIMAL_NUMERIC_TYPE.numericUnaryMinus(toDecimal(first));
     }
 
     @Override
-    public BigDecimal numericExponentiation(BigDecimal first, BigDecimal second) {
-        if (first == null || second == null) {
-            return null;
-        }
-
-        if (second.remainder(BigDecimal.ONE).compareTo(BigDecimal.ZERO) == 0) {
-            return numericExponentiation(first, second.intValue());
-        } else {
-            return BigDecimal.valueOf(Math.pow(first.doubleValue(), second.doubleValue()));
-        }
-    }
-
-    public BigDecimal numericExponentiation(BigDecimal first, int second) {
-        if (first == null) {
-            return null;
-        }
-
-        if (second < 0) {
-            return first.pow(second, MATH_CONTEXT);
-        } else if (second == 0) {
-            return BigDecimal.ONE;
-        } else {
-            BigDecimal temp = first.pow(-second, MATH_CONTEXT);
-            return BigDecimal.ONE.divide(temp, MATH_CONTEXT);
-        }
+    public Number numericExponentiation(Number first, Number second) {
+        return DECIMAL_NUMERIC_TYPE.numericExponentiation(toDecimal(first), toDecimal(second));
     }
 }
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/time/pure/TemporalAmountDurationType.java b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/time/pure/TemporalAmountDurationType.java
index e5c5a758c..d99a5d231 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/time/pure/TemporalAmountDurationType.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/feel/lib/type/time/pure/TemporalAmountDurationType.java
@@ -21,7 +21,9 @@
 import java.time.Period;
 import java.time.temporal.TemporalAmount;
 
-public class TemporalAmountDurationType extends BaseJavaTimeCalendarType implements DurationType<TemporalAmount, BigDecimal> {
+import static com.gs.dmn.feel.lib.type.numeric.DefaultNumericType.toDecimal;
+
+public class TemporalAmountDurationType extends BaseJavaTimeCalendarType implements DurationType<TemporalAmount, Number> {
     private final TemporalAmountComparator comparator;
 
     public TemporalAmountDurationType() {
@@ -146,16 +148,17 @@ public BigDecimal durationDivide(TemporalAmount first, TemporalAmount second) {
     }
 
     @Override
-    public TemporalAmount durationMultiplyNumber(TemporalAmount first, BigDecimal second) {
+    public TemporalAmount durationMultiplyNumber(TemporalAmount first, Number second) {
         if (first == null || second == null) {
             return null;
         }
 
+        BigDecimal secondDecimal = toDecimal(second);
         if (first instanceof Period) {
-            BigDecimal months = BigDecimal.valueOf(value((Period) first)).multiply(second);
+            BigDecimal months = BigDecimal.valueOf(value((Period) first)).multiply(secondDecimal);
             return Period.of((int) (months.longValue() / 12), (int) (months.longValue() % 12), 0).normalized();
         } else if (first instanceof Duration) {
-            BigDecimal seconds = BigDecimal.valueOf(value((Duration) first)).multiply(second);
+            BigDecimal seconds = BigDecimal.valueOf(value((Duration) first)).multiply(secondDecimal);
             return Duration.ofSeconds(seconds.longValue());
         } else {
             throw new DMNRuntimeException(String.format("Cannot multiply '%s' by '%s'", first, second));
@@ -163,18 +166,19 @@ public TemporalAmount durationMultiplyNumber(TemporalAmount first, BigDecimal se
     }
 
     @Override
-    public TemporalAmount durationDivideNumber(TemporalAmount first, BigDecimal second) {
+    public TemporalAmount durationDivideNumber(TemporalAmount first, Number second) {
         if (first == null || second == null) {
             return null;
         }
 
+        BigDecimal secondDecimal = toDecimal(second);
         if (first instanceof Period) {
-            BigDecimal bdMonths = BigDecimal.valueOf(value((Period) first)).divide(second, RoundingMode.HALF_DOWN);
+            BigDecimal bdMonths = BigDecimal.valueOf(value((Period) first)).divide(secondDecimal, RoundingMode.HALF_DOWN);
             int years = bdMonths.intValue() / 12;
             int months = bdMonths.intValue() % 12;
             return Period.of(years, months, 0).normalized();
         } else if (first instanceof Duration) {
-            BigDecimal seconds = BigDecimal.valueOf(value((Duration) first)).divide(second, RoundingMode.HALF_DOWN);
+            BigDecimal seconds = BigDecimal.valueOf(value((Duration) first)).divide(secondDecimal, RoundingMode.HALF_DOWN);
             return Duration.ofSeconds(seconds.longValue());
         } else {
             throw new DMNRuntimeException(String.format("Cannot divide '%s' by '%s'", first, second));
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/DefaultSignavioLib.java b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/DefaultSignavioLib.java
index e8e1decb7..88c191830 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/DefaultSignavioLib.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/DefaultSignavioLib.java
@@ -30,8 +30,8 @@
 import com.gs.dmn.feel.lib.type.time.xml.DefaultDurationLib;
 import com.gs.dmn.signavio.feel.lib.type.list.DefaultSignavioListLib;
 import com.gs.dmn.signavio.feel.lib.type.list.SignavioListLib;
-import com.gs.dmn.signavio.feel.lib.type.numeric.DefaultSignavioNumberLib;
-import com.gs.dmn.signavio.feel.lib.type.numeric.DefaultSignavioNumericType;
+import com.gs.dmn.signavio.feel.lib.type.numeric.DecimalSignavioNumberLib;
+import com.gs.dmn.signavio.feel.lib.type.numeric.DecimalSignavioNumericType;
 import com.gs.dmn.signavio.feel.lib.type.numeric.SignavioNumberLib;
 import com.gs.dmn.signavio.feel.lib.type.string.DefaultSignavioStringLib;
 import com.gs.dmn.signavio.feel.lib.type.string.DefaultSignavioStringType;
@@ -44,11 +44,11 @@
 import java.math.BigDecimal;
 
 /**
- * @deprecated  As of release 8.3.0, replaced by {@link JavaTimeSignavioLib}
+ * @deprecated As of release 8.3.0, replaced by {@link JavaTimeSignavioLib}
  */
 @Deprecated
 public class DefaultSignavioLib extends BaseSignavioLib<BigDecimal, XMLGregorianCalendar, XMLGregorianCalendar, XMLGregorianCalendar, Duration> {
-    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DefaultSignavioNumericType();
+    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DecimalSignavioNumericType();
     private static final BooleanType BOOLEAN_TYPE = new DefaultBooleanType();
     private static final StringType STRING_TYPE = new DefaultSignavioStringType();
     private static final DateType<XMLGregorianCalendar, Duration> DATE_TYPE = new DefaultSignavioDateType();
@@ -60,7 +60,7 @@ public class DefaultSignavioLib extends BaseSignavioLib<BigDecimal, XMLGregorian
     private static final RangeType RANGE_TYPE = new DefaultRangeType();
     private static final FunctionType FUNCTION_TYPE = new DefaultFunctionType();
 
-    private static final SignavioNumberLib<BigDecimal> NUMBER_LIB = new DefaultSignavioNumberLib();
+    private static final SignavioNumberLib<BigDecimal> NUMBER_LIB = new DecimalSignavioNumberLib();
     private static final SignavioStringLib STRING_LIB = new DefaultSignavioStringLib();
     private static final BooleanLib BOOLEAN_LIB = new DefaultBooleanLib();
     private static final DurationLib<XMLGregorianCalendar, Duration> DURATION_LIB = new DefaultDurationLib();
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLib.java b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLib.java
index 9c2be3703..e8072b2b2 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLib.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLib.java
@@ -44,20 +44,20 @@
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimeSignavioLib extends BaseSignavioLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
-    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DefaultSignavioNumericType();
+public class JavaTimeSignavioLib extends BaseSignavioLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+    private static final NumericType<Number> NUMERIC_TYPE = new DefaultSignavioNumericType();
     private static final BooleanType BOOLEAN_TYPE = new DefaultBooleanType();
     private static final StringType STRING_TYPE = new DefaultSignavioStringType();
     private static final DateType<LocalDate, TemporalAmount> DATE_TYPE = new SignavioLocalDateType();
     private static final TimeType<TemporalAccessor, TemporalAmount> TIME_TYPE = new SignavioTemporalTimeType();
     private static final DateTimeType<TemporalAccessor, TemporalAmount> DATE_TIME_TYPE = new SignavioTemporalDateTimeType();
-    private static final DurationType<TemporalAmount, BigDecimal> TemporalAmount_TYPE = new SignavioTemporalAmountDurationType();
+    private static final DurationType<TemporalAmount, Number> TemporalAmount_TYPE = new SignavioTemporalAmountDurationType();
     private static final ListType LIST_TYPE = new DefaultListType();
     private static final ContextType CONTEXT_TYPE = new DefaultContextType();
     private static final RangeType RANGE_TYPE = new DefaultRangeType();
     private static final FunctionType FUNCTION_TYPE = new DefaultFunctionType();
 
-    private static final SignavioNumberLib<BigDecimal> NUMBER_LIB = new DefaultSignavioNumberLib();
+    private static final SignavioNumberLib<Number> NUMBER_LIB = new DefaultSignavioNumberLib();
     private static final SignavioStringLib STRING_LIB = new DefaultSignavioStringLib();
     private static final BooleanLib BOOLEAN_LIB = new DefaultBooleanLib();
     private static final SignavioDateTimeLib DATE_TIME_LIB = new SignavioTemporalDateTimeLib();
@@ -88,13 +88,13 @@ public JavaTimeSignavioLib() {
     }
 
     protected JavaTimeSignavioLib(
-            NumericType<BigDecimal> numericType, BooleanType booleanType, StringType stringType,
-            DateType<LocalDate, TemporalAmount> dateType, TimeType<TemporalAccessor, TemporalAmount> timeType, DateTimeType<TemporalAccessor, TemporalAmount> dateTimeType, DurationType<TemporalAmount, BigDecimal> durationType,
+            NumericType<Number> numericType, BooleanType booleanType, StringType stringType,
+            DateType<LocalDate, TemporalAmount> dateType, TimeType<TemporalAccessor, TemporalAmount> timeType, DateTimeType<TemporalAccessor, TemporalAmount> dateTimeType, DurationType<TemporalAmount, Number> durationType,
             ListType listType, ContextType contextType, RangeType rangeType, FunctionType functionType,
-            SignavioNumberLib<BigDecimal> numberLib,
+            SignavioNumberLib<Number> numberLib,
             SignavioStringLib stringLib,
             BooleanLib booleanLib,
-            SignavioDateTimeLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor> dateTimeLib,
+            SignavioDateTimeLib<Number, LocalDate, TemporalAccessor, TemporalAccessor> dateTimeLib,
             DurationLib<LocalDate, TemporalAmount> durationLib,
             SignavioListLib listLib) {
         super(numericType, booleanType, stringType,
@@ -106,7 +106,7 @@ protected JavaTimeSignavioLib(
     //
     // Date and time operations
     //
-    public TemporalAccessor dayAdd(TemporalAccessor dateTime, BigDecimal daysToAdd) {
+    public TemporalAccessor dayAdd(TemporalAccessor dateTime, Number daysToAdd) {
         try {
             return this.dateTimeLib.dayAddDateTime(dateTime, daysToAdd);
         } catch (Exception e) {
@@ -116,7 +116,7 @@ public TemporalAccessor dayAdd(TemporalAccessor dateTime, BigDecimal daysToAdd)
         }
     }
 
-    public TemporalAccessor monthAdd(TemporalAccessor dateTime, BigDecimal monthsToAdd) {
+    public TemporalAccessor monthAdd(TemporalAccessor dateTime, Number monthsToAdd) {
         try {
             return this.dateTimeLib.monthAddDateTime(dateTime, monthsToAdd);
         } catch (Exception e) {
@@ -126,7 +126,7 @@ public TemporalAccessor monthAdd(TemporalAccessor dateTime, BigDecimal monthsToA
         }
     }
 
-    public TemporalAccessor yearAdd(TemporalAccessor dateTime, BigDecimal yearsToAdd) {
+    public TemporalAccessor yearAdd(TemporalAccessor dateTime, Number yearsToAdd) {
         try {
             return this.dateTimeLib.yearAddDateTime(dateTime, yearsToAdd);
         } catch (Exception e) {
@@ -140,12 +140,12 @@ public TemporalAccessor yearAdd(TemporalAccessor dateTime, BigDecimal yearsToAdd
     // Extra conversion functions
     //
     @Override
-    protected BigDecimal valueOf(long number) {
+    protected Number valueOf(long number) {
         return BigDecimal.valueOf(number);
     }
 
     @Override
-    protected int intValue(BigDecimal number) {
+    protected int intValue(Number number) {
         return number.intValue();
     }
 }
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/MixedJavaTimeSignavioLib.java b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/MixedJavaTimeSignavioLib.java
index f09a91f96..893b3936a 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/MixedJavaTimeSignavioLib.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/MixedJavaTimeSignavioLib.java
@@ -30,8 +30,8 @@
 import com.gs.dmn.feel.lib.type.time.mixed.MixedDurationLib;
 import com.gs.dmn.signavio.feel.lib.type.list.DefaultSignavioListLib;
 import com.gs.dmn.signavio.feel.lib.type.list.SignavioListLib;
-import com.gs.dmn.signavio.feel.lib.type.numeric.DefaultSignavioNumberLib;
-import com.gs.dmn.signavio.feel.lib.type.numeric.DefaultSignavioNumericType;
+import com.gs.dmn.signavio.feel.lib.type.numeric.DecimalSignavioNumberLib;
+import com.gs.dmn.signavio.feel.lib.type.numeric.DecimalSignavioNumericType;
 import com.gs.dmn.signavio.feel.lib.type.numeric.SignavioNumberLib;
 import com.gs.dmn.signavio.feel.lib.type.string.DefaultSignavioStringLib;
 import com.gs.dmn.signavio.feel.lib.type.string.DefaultSignavioStringType;
@@ -50,11 +50,11 @@
 import java.time.ZonedDateTime;
 
 /**
- * @deprecated  As of release 8.3.0, replaced by {@link JavaTimeSignavioLib}
+ * @deprecated As of release 8.3.0, replaced by {@link JavaTimeSignavioLib}
  */
 @Deprecated
 public class MixedJavaTimeSignavioLib extends BaseSignavioLib<BigDecimal, LocalDate, OffsetTime, ZonedDateTime, Duration> {
-    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DefaultSignavioNumericType();
+    private static final NumericType<BigDecimal> NUMERIC_TYPE = new DecimalSignavioNumericType();
     private static final BooleanType BOOLEAN_TYPE = new DefaultBooleanType();
     private static final StringType STRING_TYPE = new DefaultSignavioStringType();
     private static final DateType<LocalDate, Duration> DATE_TYPE = new SignavioLocalDateType();
@@ -66,7 +66,7 @@ public class MixedJavaTimeSignavioLib extends BaseSignavioLib<BigDecimal, LocalD
     private static final RangeType RANGE_TYPE = new DefaultRangeType();
     private static final FunctionType FUNCTION_TYPE = new DefaultFunctionType();
 
-    private static final SignavioNumberLib<BigDecimal> NUMBER_LIB = new DefaultSignavioNumberLib();
+    private static final SignavioNumberLib<BigDecimal> NUMBER_LIB = new DecimalSignavioNumberLib();
     private static final SignavioStringLib STRING_LIB = new DefaultSignavioStringLib();
     private static final BooleanLib BOOLEAN_LIB = new DefaultBooleanLib();
     private static final SignavioDateTimeLib DATE_TIME_LIB = new MixedSignavioDateTimeLib();
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DecimalSignavioNumberLib.java b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DecimalSignavioNumberLib.java
new file mode 100644
index 000000000..f2c7277be
--- /dev/null
+++ b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DecimalSignavioNumberLib.java
@@ -0,0 +1,275 @@
+/*
+ * Copyright 2016 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.gs.dmn.signavio.feel.lib.type.numeric;
+
+import com.gs.dmn.signavio.feel.lib.SignavioUtil;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.gs.dmn.feel.lib.type.numeric.DecimalNumericType.MATH_CONTEXT;
+
+public class DecimalSignavioNumberLib implements SignavioNumberLib<BigDecimal> {
+    @Override
+    public BigDecimal number(String literal) {
+        if (!SignavioUtil.areNullSafe(literal)) {
+            return null;
+        }
+
+        return new BigDecimal(literal, MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal number(String text, BigDecimal defaultValue) {
+        if (!SignavioUtil.areNullSafe(text, defaultValue)) {
+            return null;
+        }
+
+        BigDecimal number = null;
+        try {
+            number = number(text);
+        } catch (Exception e) {
+        }
+        return number != null ? number : defaultValue;
+    }
+
+    @Override
+    public BigDecimal abs(BigDecimal number) {
+        if (!SignavioUtil.areNullSafe(number)) {
+            return null;
+        }
+
+        return number.abs();
+    }
+
+    @Override
+    public BigDecimal count(List<?> list) {
+        if (!SignavioUtil.areNullSafe(list)) {
+            return null;
+        }
+
+        return BigDecimal.valueOf(list.size());
+    }
+
+    @Override
+    public BigDecimal round(BigDecimal number, BigDecimal digits) {
+        if (!SignavioUtil.areNullSafe(number, digits)) {
+            return null;
+        }
+
+        return number.setScale(digits.intValue(), RoundingMode.HALF_EVEN);
+    }
+
+    @Override
+    public BigDecimal ceiling(BigDecimal number) {
+        if (!SignavioUtil.areNullSafe(number)) {
+            return null;
+        }
+
+        return number.setScale(0, RoundingMode.CEILING);
+    }
+
+    @Override
+    public BigDecimal floor(BigDecimal number) {
+        if (!SignavioUtil.areNullSafe(number)) {
+            return null;
+        }
+
+        return number.setScale(0, RoundingMode.FLOOR);
+    }
+
+    @Override
+    public BigDecimal integer(BigDecimal number) {
+        if (!SignavioUtil.areNullSafe(number)) {
+            return null;
+        }
+
+        return BigDecimal.valueOf(number.intValue());
+    }
+
+    @Override
+    public BigDecimal modulo(BigDecimal dividend, BigDecimal divisor) {
+        if (!SignavioUtil.areNullSafe(dividend, divisor) || divisor.compareTo(BigDecimal.ZERO) == 0) {
+            return null;
+        }
+
+        return dividend.remainder(divisor, MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal power(BigDecimal base, BigDecimal exponent) {
+        if (!SignavioUtil.areNullSafe(base, exponent)) {
+            return null;
+        }
+
+        return base.pow(exponent.intValue(), MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal percent(BigDecimal number) {
+        if (!SignavioUtil.areNullSafe(number)) {
+            return null;
+        }
+
+        return number.divide(BigDecimal.valueOf(100), MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal product(List<?> numbers) {
+        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
+            return null;
+        }
+
+        BigDecimal result = BigDecimal.valueOf(1);
+        for (BigDecimal number : SignavioUtil.asBigDecimals(numbers)) {
+            result = result.multiply(number);
+        }
+        return result;
+    }
+
+    @Override
+    public BigDecimal roundDown(BigDecimal number, BigDecimal digits) {
+        if (!SignavioUtil.areNullSafe(number, digits)) {
+            return null;
+        }
+
+        return number.setScale(digits.intValue(), RoundingMode.DOWN);
+    }
+
+    @Override
+    public BigDecimal roundUp(BigDecimal number, BigDecimal digits) {
+        if (!SignavioUtil.areNullSafe(number, digits)) {
+            return null;
+        }
+
+        return number.setScale(digits.intValue(), RoundingMode.UP);
+    }
+
+    @Override
+    public BigDecimal sum(List<?> numbers) {
+        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
+            return null;
+        }
+
+        BigDecimal result = BigDecimal.ZERO;
+        for (BigDecimal number : SignavioUtil.asBigDecimals(numbers)) {
+            result = result.add(number);
+        }
+        return result;
+    }
+
+    @Override
+    public BigDecimal avg(List<?> numbers) {
+        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
+            return null;
+        }
+
+        return this.sum(numbers).divide(BigDecimal.valueOf(numbers.size()), MATH_CONTEXT);
+    }
+
+    @Override
+    public BigDecimal max(List<?> numbers) {
+        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
+            return null;
+        }
+
+        List<BigDecimal> decimals = SignavioUtil.asBigDecimals(numbers);
+        BigDecimal result = decimals.get(0);
+        for (BigDecimal number : decimals) {
+            if (number.compareTo(result) > 0) {
+                result = number;
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public BigDecimal median(List<?> numbers) {
+        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
+            return null;
+        }
+
+        List<BigDecimal> decimals = SignavioUtil.asBigDecimals(numbers);
+        if (decimals.size() == 1) {
+            return decimals.get(0);
+        } else {
+            Collections.sort(decimals);
+            int size = decimals.size();
+            int index = size / 2;
+            if (size % 2 == 0) {
+                BigDecimal lowerMedian = decimals.get(index - 1);
+                BigDecimal upperMedian = decimals.get(index);
+                return lowerMedian.add(upperMedian).divide(new BigDecimal(2), MATH_CONTEXT);
+            } else {
+                return decimals.get(index);
+            }
+        }
+    }
+
+    @Override
+    public BigDecimal min(List<?> list) {
+        if (!SignavioUtil.verifyValidityOfListArgument(list)) {
+            return null;
+        }
+
+        List<BigDecimal> decimals = SignavioUtil.asBigDecimals(list);
+        BigDecimal result = decimals.get(0);
+        for (BigDecimal number : decimals) {
+            if (number.compareTo(result) < 0) {
+                result = number;
+            }
+        }
+        return result;
+    }
+
+    @Override
+    public BigDecimal mode(List<?> numbers) {
+        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
+            return null;
+        }
+
+        Map<Object, Integer> map = new LinkedHashMap<>();
+        int top = -1;
+        List<BigDecimal> decimals = SignavioUtil.asBigDecimals(numbers);
+        BigDecimal returnValue = decimals.get(0);
+        for (BigDecimal value : decimals) {
+            Integer count = map.get(value);
+            int currentCount = count == null ? 1 : count + 1;
+            map.put(value, currentCount);
+            if (currentCount > top) {
+                top = currentCount;
+                returnValue = value;
+            }
+        }
+        return returnValue;
+    }
+
+    @Override
+    public BigDecimal valueOf(long number) {
+        return BigDecimal.valueOf(number);
+    }
+
+    @Override
+    public int intValue(BigDecimal number) {
+        return number.intValue();
+    }
+
+    @Override
+    public Number toNumber(BigDecimal number) {
+        return number;
+    }
+}
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DecimalSignavioNumericType.java b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DecimalSignavioNumericType.java
new file mode 100644
index 000000000..79bc71731
--- /dev/null
+++ b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DecimalSignavioNumericType.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2016 Goldman Sachs.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License.
+ *
+ * You may obtain a copy of the License at
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package com.gs.dmn.signavio.feel.lib.type.numeric;
+
+import com.gs.dmn.feel.lib.type.numeric.DecimalNumericType;
+import com.gs.dmn.signavio.feel.lib.type.SignavioComparableComparator;
+
+public class DecimalSignavioNumericType extends DecimalNumericType {
+    public DecimalSignavioNumericType() {
+        super(new SignavioComparableComparator<>());
+    }
+}
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DefaultSignavioNumberLib.java b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DefaultSignavioNumberLib.java
index c22761733..9ffcd04d8 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DefaultSignavioNumberLib.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DefaultSignavioNumberLib.java
@@ -12,264 +12,125 @@
  */
 package com.gs.dmn.signavio.feel.lib.type.numeric;
 
-import com.gs.dmn.signavio.feel.lib.SignavioUtil;
-
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.util.Collections;
-import java.util.LinkedHashMap;
 import java.util.List;
-import java.util.Map;
 
-import static com.gs.dmn.feel.lib.type.numeric.DefaultNumericType.MATH_CONTEXT;
+import static com.gs.dmn.feel.lib.type.numeric.DefaultNumericType.toDecimal;
 
-public class DefaultSignavioNumberLib implements SignavioNumberLib<BigDecimal> {
-    @Override
-    public BigDecimal number(String literal) {
-        if (!SignavioUtil.areNullSafe(literal)) {
-            return null;
-        }
+public class DefaultSignavioNumberLib implements SignavioNumberLib<Number> {
+    private static final DecimalSignavioNumberLib DECIMAL_SIGNAVIO_NUMBER_LIB = new DecimalSignavioNumberLib();
 
-        return new BigDecimal(literal, MATH_CONTEXT);
+    @Override
+    public Number number(String literal) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.number(literal);
     }
 
     @Override
-    public BigDecimal number(String text, BigDecimal defaultValue) {
-        if (!SignavioUtil.areNullSafe(text, defaultValue)) {
-            return null;
-        }
-
-        BigDecimal number = null;
-        try {
-            number = number(text);
-        } catch (Exception e) {
-        }
-        return number != null ? number : defaultValue;
+    public Number number(String text, Number defaultValue) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.number(text, toDecimal(defaultValue));
     }
 
     @Override
-    public BigDecimal abs(BigDecimal number) {
-        if (!SignavioUtil.areNullSafe(number)) {
-            return null;
-        }
-
-        return number.abs();
+    public Number abs(Number number) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.abs(toDecimal(number));
     }
 
     @Override
-    public BigDecimal count(List<?> list) {
-        if (!SignavioUtil.areNullSafe(list)) {
-            return null;
-        }
-
-        return BigDecimal.valueOf(list.size());
+    public Number count(List<?> list) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.count(list);
     }
 
     @Override
-    public BigDecimal round(BigDecimal number, BigDecimal digits) {
-        if (!SignavioUtil.areNullSafe(number, digits)) {
-            return null;
-        }
-
-        return number.setScale(digits.intValue(), RoundingMode.HALF_EVEN);
+    public Number round(Number number, Number digits) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.round(toDecimal(number), toDecimal(digits));
     }
 
     @Override
-    public BigDecimal ceiling(BigDecimal number) {
-        if (!SignavioUtil.areNullSafe(number)) {
-            return null;
-        }
-
-        return number.setScale(0, RoundingMode.CEILING);
+    public Number ceiling(Number number) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.ceiling(toDecimal(number));
     }
 
     @Override
-    public BigDecimal floor(BigDecimal number) {
-        if (!SignavioUtil.areNullSafe(number)) {
-            return null;
-        }
-
-        return number.setScale(0, RoundingMode.FLOOR);
+    public Number floor(Number number) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.floor(toDecimal(number));
     }
 
     @Override
-    public BigDecimal integer(BigDecimal number) {
-        if (!SignavioUtil.areNullSafe(number)) {
-            return null;
-        }
-
-        return BigDecimal.valueOf(number.intValue());
+    public Number integer(Number number) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.integer(toDecimal(number));
     }
 
     @Override
-    public BigDecimal modulo(BigDecimal dividend, BigDecimal divisor) {
-        if (!SignavioUtil.areNullSafe(dividend, divisor) || divisor.compareTo(BigDecimal.ZERO) == 0) {
-            return null;
-        }
-
-        return dividend.remainder(divisor, MATH_CONTEXT);
+    public Number modulo(Number dividend, Number divisor) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.modulo(toDecimal(dividend), toDecimal(divisor));
     }
 
     @Override
-    public BigDecimal power(BigDecimal base, BigDecimal exponent) {
-        if (!SignavioUtil.areNullSafe(base, exponent)) {
-            return null;
-        }
-
-        return base.pow(exponent.intValue(), MATH_CONTEXT);
+    public Number power(Number base, Number exponent) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.power(toDecimal(base), toDecimal(exponent));
     }
 
     @Override
-    public BigDecimal percent(BigDecimal number) {
-        if (!SignavioUtil.areNullSafe(number)) {
-            return null;
-        }
-
-        return number.divide(BigDecimal.valueOf(100), MATH_CONTEXT);
+    public Number percent(Number number) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.percent(toDecimal(number));
     }
 
     @Override
-    public BigDecimal product(List<?> numbers) {
-        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
-            return null;
-        }
-
-        BigDecimal result = BigDecimal.valueOf(1);
-        for (BigDecimal number : SignavioUtil.asBigDecimals(numbers)) {
-            result = result.multiply(number);
-        }
-        return result;
+    public Number product(List<?> numbers) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.product(numbers);
     }
 
     @Override
-    public BigDecimal roundDown(BigDecimal number, BigDecimal digits) {
-        if (!SignavioUtil.areNullSafe(number, digits)) {
-            return null;
-        }
-
-        return number.setScale(digits.intValue(), RoundingMode.DOWN);
+    public Number roundDown(Number number, Number digits) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.roundDown(toDecimal(number), toDecimal(digits));
     }
 
     @Override
-    public BigDecimal roundUp(BigDecimal number, BigDecimal digits) {
-        if (!SignavioUtil.areNullSafe(number, digits)) {
-            return null;
-        }
-
-        return number.setScale(digits.intValue(), RoundingMode.UP);
+    public Number roundUp(Number number, Number digits) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.roundUp(toDecimal(number), toDecimal(digits));
     }
 
     @Override
-    public BigDecimal sum(List<?> numbers) {
-        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
-            return null;
-        }
-
-        BigDecimal result = BigDecimal.ZERO;
-        for (BigDecimal number : SignavioUtil.asBigDecimals(numbers)) {
-            result = result.add(number);
-        }
-        return result;
+    public Number sum(List<?> numbers) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.sum(numbers);
     }
 
     @Override
-    public BigDecimal avg(List<?> numbers) {
-        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
-            return null;
-        }
-
-        return this.sum(numbers).divide(BigDecimal.valueOf(numbers.size()), MATH_CONTEXT);
+    public Number avg(List<?> numbers) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.avg(numbers);
     }
 
     @Override
-    public BigDecimal max(List<?> numbers) {
-        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
-            return null;
-        }
-
-        List<BigDecimal> decimals = SignavioUtil.asBigDecimals(numbers);
-        BigDecimal result = decimals.get(0);
-        for (BigDecimal number: decimals) {
-            if (number.compareTo(result) > 0) {
-                result = number;
-            }
-        }
-        return result;
+    public Number max(List<?> numbers) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.max(numbers);
     }
 
     @Override
-    public BigDecimal median(List<?> numbers) {
-        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
-            return null;
-        }
-
-        List<BigDecimal> decimals = SignavioUtil.asBigDecimals(numbers);
-        if (decimals.size() == 1) {
-            return decimals.get(0);
-        } else {
-            Collections.sort(decimals);
-            int size = decimals.size();
-            int index = size / 2;
-            if (size % 2 == 0) {
-                BigDecimal lowerMedian = decimals.get(index - 1);
-                BigDecimal upperMedian = decimals.get(index);
-                return lowerMedian.add(upperMedian).divide(new BigDecimal(2), MATH_CONTEXT);
-            } else {
-                return decimals.get(index);
-            }
-        }
+    public Number median(List<?> numbers) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.median(numbers);
     }
 
     @Override
-    public BigDecimal min(List<?> list) {
-        if (!SignavioUtil.verifyValidityOfListArgument(list)) {
-            return null;
-        }
-
-        List<BigDecimal> decimals = SignavioUtil.asBigDecimals(list);
-        BigDecimal result = decimals.get(0);
-        for (BigDecimal number: decimals) {
-            if (number.compareTo(result) < 0) {
-                result = number;
-            }
-        }
-        return result;
+    public Number min(List<?> list) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.min(list);
     }
 
     @Override
-    public BigDecimal mode(List<?> numbers) {
-        if (!SignavioUtil.verifyValidityOfListArgument(numbers)) {
-            return null;
-        }
-
-        Map<Object, Integer> map = new LinkedHashMap<>();
-        int top = -1;
-        List<BigDecimal> decimals = SignavioUtil.asBigDecimals(numbers);
-        BigDecimal returnValue = decimals.get(0);
-        for (BigDecimal value : decimals) {
-            Integer count = map.get(value);
-            int currentCount = count == null ? 1 : count + 1;
-            map.put(value, currentCount);
-            if (currentCount > top) {
-                top = currentCount;
-                returnValue = value;
-            }
-        }
-        return returnValue;
+    public Number mode(List<?> numbers) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.mode(numbers);
     }
 
     @Override
-    public BigDecimal valueOf(long number) {
-        return BigDecimal.valueOf(number);
+    public Number valueOf(long number) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.valueOf(number);
     }
 
     @Override
-    public int intValue(BigDecimal number) {
-        return number.intValue();
+    public int intValue(Number number) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.intValue(toDecimal(number));
     }
 
     @Override
-    public Number toNumber(BigDecimal number) {
-        return number;
+    public Number toNumber(Number number) {
+        return DECIMAL_SIGNAVIO_NUMBER_LIB.toNumber(toDecimal(number));
     }
 }
diff --git a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DefaultSignavioNumericType.java b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DefaultSignavioNumericType.java
index 56752110e..0dbf3c5ea 100644
--- a/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DefaultSignavioNumericType.java
+++ b/dmn-runtime/src/main/java/com/gs/dmn/signavio/feel/lib/type/numeric/DefaultSignavioNumericType.java
@@ -13,10 +13,8 @@
 package com.gs.dmn.signavio.feel.lib.type.numeric;
 
 import com.gs.dmn.feel.lib.type.numeric.DefaultNumericType;
-import com.gs.dmn.signavio.feel.lib.type.SignavioComparableComparator;
 
 public class DefaultSignavioNumericType extends DefaultNumericType {
     public DefaultSignavioNumericType() {
-        super(new SignavioComparableComparator<>());
     }
 }
diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/JavaTimeFEELLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/JavaTimeFEELLibExceptionsTest.java
index 32050f70c..29304a69e 100644
--- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/JavaTimeFEELLibExceptionsTest.java
+++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/JavaTimeFEELLibExceptionsTest.java
@@ -27,29 +27,28 @@
 import com.gs.dmn.feel.lib.type.string.StringType;
 import com.gs.dmn.feel.lib.type.time.*;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimeFEELLibExceptionsTest extends BaseStandardFEELLibExceptionsTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeFEELLibExceptionsTest extends BaseStandardFEELLibExceptionsTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
     protected JavaTimeFEELLib getLib() {
-        NumericType<BigDecimal> numericType = new NumericTypeStub<>();
+        NumericType<Number> numericType = new NumericTypeStub<>();
         BooleanType booleanType = new BooleanTypeStub();
         StringType stringType = new StringTypeStub();
         DateType<LocalDate, TemporalAmount> dateType = new DateTypeStub<>();
         TimeType<TemporalAccessor, TemporalAmount> timeType = new TimeTypeStub<>();
         DateTimeType<TemporalAccessor, TemporalAmount> dateTimeType = new DateTimeTypeStub<>();
-        DurationType<TemporalAmount, BigDecimal> durationType = new DurationTypeStub<>();
+        DurationType<TemporalAmount, Number> durationType = new DurationTypeStub<>();
         ListType listType = new ListTypeStub();
         ContextType contextType = new ContextTypeStub();
         RangeType rangeType = new RangeTypeStub();
         FunctionType functionType = new FunctionTypeStub();
-        NumericLib<BigDecimal> numericLib = new NumericLibStub<>();
+        NumericLib<Number> numericLib = new NumericLibStub<>();
         StringLib stringLib = new StringLibStub();
         BooleanLib booleanLib = new BooleanLibStub();
-        DateTimeLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> dateTimeLib = new DateTimeLibStub<>();
+        DateTimeLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> dateTimeLib = new DateTimeLibStub<>();
         DurationLib<LocalDate, TemporalAmount> durationLib = new DurationLibStub<>();
         ListLib listLib = new ListLibStub();
         RangeLib rangeLib = new RangeLibStub();
diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/JavaTimeFEELLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/JavaTimeFEELLibTest.java
index 2323961ed..c0b8c9a74 100644
--- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/JavaTimeFEELLibTest.java
+++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/JavaTimeFEELLibTest.java
@@ -14,14 +14,13 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class JavaTimeFEELLibTest extends BaseStandardFEELLibTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeFEELLibTest extends BaseStandardFEELLibTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
     protected JavaTimeFEELLib getLib() {
         return new JavaTimeFEELLib();
diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalDateTimeDefaultRangeLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalDateTimeDefaultRangeLibTest.java
index 7295e96d7..82fd9e8e5 100644
--- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalDateTimeDefaultRangeLibTest.java
+++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalDateTimeDefaultRangeLibTest.java
@@ -15,14 +15,13 @@
 import com.gs.dmn.feel.lib.JavaTimeFEELLib;
 import com.gs.dmn.feel.lib.StandardFEELLib;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class TemporalDateTimeDefaultRangeLibTest extends AbstractDefaultRangeLibTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class TemporalDateTimeDefaultRangeLibTest extends AbstractDefaultRangeLibTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected StandardFEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> getLib() {
+    protected StandardFEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> getLib() {
         return new JavaTimeFEELLib();
     }
 
diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalDurationDefaultRangeLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalDurationDefaultRangeLibTest.java
index d1ff83531..882331287 100644
--- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalDurationDefaultRangeLibTest.java
+++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalDurationDefaultRangeLibTest.java
@@ -15,14 +15,13 @@
 import com.gs.dmn.feel.lib.JavaTimeFEELLib;
 import com.gs.dmn.feel.lib.StandardFEELLib;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class TemporalDurationDefaultRangeLibTest extends AbstractDefaultRangeLibTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class TemporalDurationDefaultRangeLibTest extends AbstractDefaultRangeLibTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected StandardFEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> getLib() {
+    protected StandardFEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> getLib() {
         return new JavaTimeFEELLib();
     }
 
diff --git a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalTimeDefaultRangeLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalTimeDefaultRangeLibTest.java
index 2d67cb1e9..714e0a786 100644
--- a/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalTimeDefaultRangeLibTest.java
+++ b/dmn-runtime/src/test/java/com/gs/dmn/feel/lib/type/range/TemporalTimeDefaultRangeLibTest.java
@@ -15,14 +15,13 @@
 import com.gs.dmn.feel.lib.JavaTimeFEELLib;
 import com.gs.dmn.feel.lib.StandardFEELLib;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class TemporalTimeDefaultRangeLibTest extends AbstractDefaultRangeLibTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class TemporalTimeDefaultRangeLibTest extends AbstractDefaultRangeLibTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected StandardFEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> getLib() {
+    protected StandardFEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> getLib() {
         return new JavaTimeFEELLib();
     }
 
diff --git a/dmn-runtime/src/test/java/com/gs/dmn/serialization/JavaTimeJsonSerializerTest.java b/dmn-runtime/src/test/java/com/gs/dmn/serialization/JavaTimeJsonSerializerTest.java
index 924aa6316..31d897c13 100644
--- a/dmn-runtime/src/test/java/com/gs/dmn/serialization/JavaTimeJsonSerializerTest.java
+++ b/dmn-runtime/src/test/java/com/gs/dmn/serialization/JavaTimeJsonSerializerTest.java
@@ -27,14 +27,14 @@
 
 import static com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER;
 
-public class JavaTimeJsonSerializerTest extends AbstractJsonSerializerTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeJsonSerializerTest extends AbstractJsonSerializerTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
-    protected FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> makeFEELLib() {
+    protected FEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> makeFEELLib() {
         return new JavaTimeFEELLib();
     }
 
     @Override
-    protected BigDecimal readNumber(String literal) throws Exception {
+    protected Number readNumber(String literal) throws Exception {
         return OBJECT_MAPPER.readValue(literal, BigDecimal.class);
     }
 
diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLibExceptionsTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLibExceptionsTest.java
index 9929e4d73..b443fd417 100644
--- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLibExceptionsTest.java
+++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLibExceptionsTest.java
@@ -33,7 +33,6 @@
 import com.gs.dmn.signavio.feel.lib.type.time.SignavioDateTimeLib;
 import org.junit.jupiter.api.Test;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.time.temporal.TemporalAccessor;
@@ -41,24 +40,24 @@
 
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class JavaTimeSignavioLibExceptionsTest extends BaseSignavioLibExceptionsTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeSignavioLibExceptionsTest extends BaseSignavioLibExceptionsTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
     protected JavaTimeSignavioLib getLib() {
-        NumericType<BigDecimal> numericType = new NumericTypeStub<>();
+        NumericType<Number> numericType = new NumericTypeStub<>();
         BooleanType booleanType = new BooleanTypeStub();
         StringType stringType = new StringTypeStub();
         DateType<LocalDate, TemporalAmount> dateType = new DateTypeStub<>();
         TimeType<TemporalAccessor, TemporalAmount> timeType = new TimeTypeStub<>();
         DateTimeType<TemporalAccessor, TemporalAmount> dateTimeType = new DateTimeTypeStub<>();
-        DurationType<TemporalAmount, BigDecimal> durationType = new DurationTypeStub<>();
+        DurationType<TemporalAmount, Number> durationType = new DurationTypeStub<>();
         ListType listType = new ListTypeStub();
         ContextType contextType = new ContextTypeStub();
         RangeType rangeType = new RangeTypeStub();
         FunctionType functionType = new FunctionTypeStub();
-        SignavioNumberLib<BigDecimal> numberLib = new SignavioNumberLibStub<>();
+        SignavioNumberLib<Number> numberLib = new SignavioNumberLibStub<>();
         SignavioStringLib stringLib = new SignavioStringLibStub();
         BooleanLib booleanLib = new BooleanLibStub();
-        SignavioDateTimeLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor> dateTimeLib = new SignavioDateTimeLibStub<>();
+        SignavioDateTimeLib<Number, LocalDate, TemporalAccessor, TemporalAccessor> dateTimeLib = new SignavioDateTimeLibStub<>();
         DurationLib<LocalDate, TemporalAmount> durationLib = new TemporalAmountDurationLib();
         SignavioListLib listLib = new SignavioListLibStub();
         return new JavaTimeSignavioLib(
diff --git a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLibTest.java b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLibTest.java
index 64bf6627f..345a4aed4 100644
--- a/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLibTest.java
+++ b/dmn-runtime/src/test/java/com/gs/dmn/signavio/feel/lib/JavaTimeSignavioLibTest.java
@@ -14,7 +14,6 @@
 
 import org.junit.jupiter.api.Test;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZonedDateTime;
 import java.time.temporal.TemporalAccessor;
@@ -24,7 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
-public class JavaTimeSignavioLibTest extends BaseSignavioLibTest<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeSignavioLibTest extends BaseSignavioLibTest<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     @Override
     protected JavaTimeSignavioLib getLib() {
         return new JavaTimeSignavioLib();
diff --git a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/JavaTimeSignavioDMNDialectDefinition.java b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/JavaTimeSignavioDMNDialectDefinition.java
index 1fc251151..b7589f7e5 100644
--- a/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/JavaTimeSignavioDMNDialectDefinition.java
+++ b/dmn-signavio/src/main/java/com/gs/dmn/signavio/dialect/JavaTimeSignavioDMNDialectDefinition.java
@@ -32,12 +32,11 @@
 import com.gs.dmn.transformation.template.TemplateProvider;
 import com.gs.dmn.validation.DMNValidator;
 
-import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalAmount;
 
-public class JavaTimeSignavioDMNDialectDefinition extends AbstractSignavioDMNDialectDefinition<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
+public class JavaTimeSignavioDMNDialectDefinition extends AbstractSignavioDMNDialectDefinition<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> {
     //
     // DMN processors
     //
@@ -61,7 +60,7 @@ public NativeTypeFactory createNativeTypeFactory() {
     }
 
     @Override
-    public FEELLib<BigDecimal, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> createFEELLib() {
+    public FEELLib<Number, LocalDate, TemporalAccessor, TemporalAccessor, TemporalAmount> createFEELLib() {
         return new JavaTimeSignavioLib();
     }
 
diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java
index 5174a987c..e8e21edcd 100644
--- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java
+++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl2_0009_invocation_arithmetic/HandwrittenMonthlyPaymentTest.java
@@ -30,9 +30,9 @@ public void testApply1() {
         loan.setAmount(decision.number("600000"));
         loan.setRate(decision.number("0.0375"));
         loan.setTerm(decision.number("360"));
-        BigDecimal fee = decision.number("100");
-        BigDecimal output = applyDecision(loan, fee);
-        assertEquals("2878.69", output.setScale(2, RoundingMode.FLOOR).toPlainString());
+        Number fee = decision.number("100");
+        Number output = applyDecision(loan, fee);
+        assertEquals("2878.69", ((BigDecimal) output).setScale(2, RoundingMode.FLOOR).toPlainString());
     }
 
     @Test
@@ -41,9 +41,9 @@ public void testApply2() {
         loan.setAmount(decision.number("30000"));
         loan.setRate(decision.number("0.0475"));
         loan.setTerm(decision.number("60"));
-        BigDecimal fee = decision.number("100");
-        BigDecimal output = applyDecision(loan, fee);
-        assertEquals("662.70", output.setScale(2, RoundingMode.FLOOR).toPlainString());
+        Number fee = decision.number("100");
+        Number output = applyDecision(loan, fee);
+        assertEquals("662.70", ((BigDecimal) output).setScale(2, RoundingMode.FLOOR).toPlainString());
     }
 
     @Override
@@ -51,7 +51,7 @@ protected void applyDecision() {
         applyDecision(null, null);
     }
 
-    private BigDecimal applyDecision(TLoanImpl loan, BigDecimal fee) {
+    private Number applyDecision(TLoanImpl loan, Number fee) {
         return decision.apply(loan, fee, context);
     }
 }
\ No newline at end of file
diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java
index 2bb32e1b3..b81c73688 100644
--- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java
+++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/HandwrittenDecisionTest.java
@@ -16,7 +16,6 @@
 import com.gs.dmn.runtime.ExecutionContext;
 import org.junit.jupiter.api.Test;
 
-import java.math.BigDecimal;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -27,25 +26,25 @@ public class HandwrittenDecisionTest extends AbstractHandwrittenDecisionTest {
 
     @Test
     public void applyCompiler() {
-        com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext();
-
-        assertEquals("27", applyDecision("16", "1", context).toPlainString());
-        assertEquals("22", applyDecision("25", "5", context).toPlainString());
-        assertEquals("24", applyDecision("25", "20", context).toPlainString());
-        assertEquals("30", applyDecision("44", "30", context).toPlainString());
-        assertEquals("24", applyDecision("50", "20", context).toPlainString());
-        assertEquals("30", applyDecision("50", "30", context).toPlainString());
-        assertEquals("30", applyDecision("60", "20", context).toPlainString());
+        com.gs.dmn.runtime.ExecutionContext context = com.gs.dmn.runtime.ExecutionContextBuilder.executionContext().build();
+
+        assertEquals("27", applyDecision("16", "1", context).toString());
+        assertEquals("22", applyDecision("25", "5", context).toString());
+        assertEquals("24", applyDecision("25", "20", context).toString());
+        assertEquals("30", applyDecision("44", "30", context).toString());
+        assertEquals("24", applyDecision("50", "20", context).toString());
+        assertEquals("30", applyDecision("50", "30", context).toString());
+        assertEquals("30", applyDecision("60", "20", context).toString());
     }
 
     @Override
     protected void applyDecision() {
-        com.gs.dmn.runtime.ExecutionContext context = new com.gs.dmn.runtime.ExecutionContext();
+        com.gs.dmn.runtime.ExecutionContext context = com.gs.dmn.runtime.ExecutionContextBuilder.executionContext().build();
 
         applyDecision(null, null, context);
     }
 
-    private BigDecimal applyDecision(String age, String yearsOfService, ExecutionContext context) {
+    private Number applyDecision(String age, String yearsOfService, ExecutionContext context) {
         Map<String, String> result = new LinkedHashMap<>();
         result.put("Age", age);
         result.put("Years of Service", yearsOfService);
diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java
index dc4ee0d25..95be8074b 100644
--- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java
+++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/PostorderTraceListenerTest.java
@@ -19,7 +19,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
-import java.math.BigDecimal;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -38,8 +37,8 @@ public void testListener() throws Exception {
         String expectedResult = "27";
         String age = "16";
         String yearsOfService = "1";
-        BigDecimal actualResult = applyDecision(age, yearsOfService, context);
-        assertEquals(expectedResult, actualResult.toPlainString());
+        Number actualResult = applyDecision(age, yearsOfService, context);
+        assertEquals(expectedResult, actualResult.toString());
 
         List<DRGElementNode> elementTraces = listener.postorderNodes();
         File actualOutputFile = writeNodes(elementTraces);
@@ -55,8 +54,8 @@ public void testListenerWithFilter() throws Exception {
         String expectedResult = "27";
         String age = "16";
         String yearsOfService = "1";
-        BigDecimal actualResult = applyDecision(age, yearsOfService, context);
-        assertEquals(expectedResult, actualResult.toPlainString());
+        Number actualResult = applyDecision(age, yearsOfService, context);
+        assertEquals(expectedResult, actualResult.toString());
 
         List<DRGElementNode> elementTraces = listener.postorderNodes();
         File actualOutputFile = writeNodes(elementTraces);
@@ -68,7 +67,7 @@ private String getExpectedPath() {
         return "traces/cl3_0020_vacation_days";
     }
 
-    private BigDecimal applyDecision(String age, String yearsOfService, ExecutionContext context) {
+    private Number applyDecision(String age, String yearsOfService, ExecutionContext context) {
         Map<String, String> result = new LinkedHashMap<>();
         result.put("Age", age);
         result.put("Years of Service", yearsOfService);
diff --git a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java
index 0ec33447d..985bc2c7c 100644
--- a/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java
+++ b/dmn-tck-it/dmn-tck-it-translator/src/test/java/com/gs/dmn/generated/tck/cl3_0020_vacation_days/TreeTraceListenerTest.java
@@ -19,7 +19,6 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
-import java.math.BigDecimal;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,8 +36,8 @@ public void testTree() throws Exception {
         String expectedResult = "27";
         String age = "16";
         String yearsOfService = "1";
-        BigDecimal actualResult = applyDecision(age, yearsOfService, context);
-        assertEquals(expectedResult, actualResult.toPlainString());
+        Number actualResult = applyDecision(age, yearsOfService, context);
+        assertEquals(expectedResult, actualResult.toString());
 
         DRGElementNode root = listener.getRoot();
         File actualOutputFile = writeNodes(root);
@@ -54,8 +53,8 @@ public void testPreorder() throws Exception {
         String expectedResult = "27";
         String age = "16";
         String yearsOfService = "1";
-        BigDecimal actualResult = applyDecision(age, yearsOfService, context);
-        assertEquals(expectedResult, actualResult.toPlainString());
+        Number actualResult = applyDecision(age, yearsOfService, context);
+        assertEquals(expectedResult, actualResult.toString());
 
         List<DRGElementNode> nodes = listener.preorderNodes();
         File actualOutputFile = writeNodes(nodes);
@@ -71,8 +70,8 @@ public void testPostorder() throws Exception {
         String expectedResult = "27";
         String age = "16";
         String yearsOfService = "1";
-        BigDecimal actualResult = applyDecision(age, yearsOfService, context);
-        assertEquals(expectedResult, actualResult.toPlainString());
+        Number actualResult = applyDecision(age, yearsOfService, context);
+        assertEquals(expectedResult, actualResult.toString());
 
         List<DRGElementNode> nodes = listener.postorderNodes();
         File actualOutputFile = writeNodes(nodes);
@@ -80,7 +79,7 @@ public void testPostorder() throws Exception {
         checkTrace(expectedOutputFile, actualOutputFile);
     }
 
-    private BigDecimal applyDecision(String age, String yearsOfService, ExecutionContext context) {
+    private Number applyDecision(String age, String yearsOfService, ExecutionContext context) {
         Map<String, String> result = new LinkedHashMap<>();
         result.put("Age", age);
         result.put("Years of Service", yearsOfService);
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisioninputs/type/TA.java b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisioninputs/type/TA.java
index dc76d88c9..1bea047ec 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisioninputs/type/TA.java
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisioninputs/type/TA.java
@@ -19,7 +19,7 @@ static TA toTA(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("price")) {
-                result_.setPrice((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("price"));
+                result_.setPrice((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("price"));
             } else {
                 return  null;
             }
@@ -35,7 +35,7 @@ static TA toTA(Object other) {
     String getName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    java.math.BigDecimal getPrice();
+    java.lang.Number getPrice();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisioninputs/type/TAImpl.java b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisioninputs/type/TAImpl.java
index 4fc6f9b9c..cd04cd079 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisioninputs/type/TAImpl.java
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisioninputs/type/TAImpl.java
@@ -6,12 +6,12 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TAImpl implements TA {
         private String name;
-        private java.math.BigDecimal price;
+        private java.lang.Number price;
 
     public TAImpl() {
     }
 
-    public TAImpl(String name, java.math.BigDecimal price) {
+    public TAImpl(String name, java.lang.Number price) {
         this.setName(name);
         this.setPrice(price);
     }
@@ -27,12 +27,12 @@ public void setName(String name) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    public java.math.BigDecimal getPrice() {
+    public java.lang.Number getPrice() {
         return this.price;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("price")
-    public void setPrice(java.math.BigDecimal price) {
+    public void setPrice(java.lang.Number price) {
         this.price = price;
     }
 
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceGt10.java b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceGt10.java
index 93b57408a..9f2c9ebf1 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceGt10.java
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceGt10.java
@@ -106,7 +106,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(decisioninputs.type.TA decisioninputs
         // Apply rule
         PriceGt10RuleOutput output_ = new PriceGt10RuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericGreaterThan(((java.math.BigDecimal)(decisioninputs_structA != null ? decisioninputs_structA.getPrice() : null)), number("10"))
+            numericGreaterThan(((java.lang.Number)(decisioninputs_structA != null ? decisioninputs_structA.getPrice() : null)), number("10"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -137,7 +137,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(decisioninputs.type.TA decisioninputs
         // Apply rule
         PriceGt10RuleOutput output_ = new PriceGt10RuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericLessEqualThan(((java.math.BigDecimal)(decisioninputs_structA != null ? decisioninputs_structA.getPrice() : null)), number("10"))
+            numericLessEqualThan(((java.lang.Number)(decisioninputs_structA != null ? decisioninputs_structA.getPrice() : null)), number("10"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
diff --git a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceInRange.java b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceInRange.java
index 9fe6b5d4a..50b98d3ee 100644
--- a/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceInRange.java
+++ b/dmn-test-cases/standard/composite/1.2/0004-decision-tables/translator/expected/java/dmn/decisiontables/PriceInRange.java
@@ -37,7 +37,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal decisioninputs_numB, java.math.BigDecimal decisioninputs_numC, decisioninputs.type.TA decisioninputs_structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number decisioninputs_numB, java.lang.Number decisioninputs_numC, decisioninputs.type.TA decisioninputs_structA, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'priceInRange'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -67,8 +67,8 @@ public String apply(java.math.BigDecimal decisioninputs_numB, java.math.BigDecim
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal decisioninputs_numB = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal decisioninputs_numC = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number decisioninputs_numB = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number decisioninputs_numC = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 decisioninputs.type.TA decisioninputs_structA = 2 < args_.length ? (decisioninputs.type.TA) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -96,7 +96,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal decisioninputs_numB, java.math.BigDecimal decisioninputs_numC, decisioninputs.type.TA decisioninputs_structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number decisioninputs_numB, java.lang.Number decisioninputs_numC, decisioninputs.type.TA decisioninputs_structA, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -110,7 +110,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal decisioninputs_n
         // Apply rule
         PriceInRangeRuleOutput output_ = new PriceInRangeRuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            booleanAnd(numericGreaterEqualThan(((java.math.BigDecimal)(decisioninputs_structA != null ? decisioninputs_structA.getPrice() : null)), decisioninputs_numB), numericLessEqualThan(((java.math.BigDecimal)(decisioninputs_structA != null ? decisioninputs_structA.getPrice() : null)), decisioninputs_numC))
+            booleanAnd(numericGreaterEqualThan(((java.lang.Number)(decisioninputs_structA != null ? decisioninputs_structA.getPrice() : null)), decisioninputs_numB), numericLessEqualThan(((java.lang.Number)(decisioninputs_structA != null ? decisioninputs_structA.getPrice() : null)), decisioninputs_numC))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -128,7 +128,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal decisioninputs_n
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal decisioninputs_numB, java.math.BigDecimal decisioninputs_numC, decisioninputs.type.TA decisioninputs_structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number decisioninputs_numB, java.lang.Number decisioninputs_numC, decisioninputs.type.TA decisioninputs_structA, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisioninputs1/type/TA.java b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisioninputs1/type/TA.java
index da2d00cff..bbd4a4565 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisioninputs1/type/TA.java
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisioninputs1/type/TA.java
@@ -19,7 +19,7 @@ static TA toTA(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("price")) {
-                result_.setPrice((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("price"));
+                result_.setPrice((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("price"));
             } else {
                 return  null;
             }
@@ -35,7 +35,7 @@ static TA toTA(Object other) {
     String getName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    java.math.BigDecimal getPrice();
+    java.lang.Number getPrice();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisioninputs1/type/TAImpl.java b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisioninputs1/type/TAImpl.java
index 3574142e3..f68743453 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisioninputs1/type/TAImpl.java
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisioninputs1/type/TAImpl.java
@@ -6,12 +6,12 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TAImpl implements TA {
         private String name;
-        private java.math.BigDecimal price;
+        private java.lang.Number price;
 
     public TAImpl() {
     }
 
-    public TAImpl(String name, java.math.BigDecimal price) {
+    public TAImpl(String name, java.lang.Number price) {
         this.setName(name);
         this.setPrice(price);
     }
@@ -27,12 +27,12 @@ public void setName(String name) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    public java.math.BigDecimal getPrice() {
+    public java.lang.Number getPrice() {
         return this.price;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("price")
-    public void setPrice(java.math.BigDecimal price) {
+    public void setPrice(java.lang.Number price) {
         this.price = price;
     }
 
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceGt10.java b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceGt10.java
index ded240a0f..a037db5ba 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceGt10.java
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceGt10.java
@@ -106,7 +106,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(decisioninputs1.type.TA decisioninput
         // Apply rule
         PriceGt10RuleOutput output_ = new PriceGt10RuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericGreaterThan(((java.math.BigDecimal)(decisioninputs1_structA != null ? decisioninputs1_structA.getPrice() : null)), number("10"))
+            numericGreaterThan(((java.lang.Number)(decisioninputs1_structA != null ? decisioninputs1_structA.getPrice() : null)), number("10"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -137,7 +137,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(decisioninputs1.type.TA decisioninput
         // Apply rule
         PriceGt10RuleOutput output_ = new PriceGt10RuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericLessEqualThan(((java.math.BigDecimal)(decisioninputs1_structA != null ? decisioninputs1_structA.getPrice() : null)), number("10"))
+            numericLessEqualThan(((java.lang.Number)(decisioninputs1_structA != null ? decisioninputs1_structA.getPrice() : null)), number("10"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
diff --git a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceInRange.java b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceInRange.java
index 822cc2b34..f71a0b57d 100644
--- a/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceInRange.java
+++ b/dmn-test-cases/standard/composite/1.2/0005-decision-tables-name-conflicts/translator/expected/java/dmn/decisiontables/PriceInRange.java
@@ -37,7 +37,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal decisioninputs1_numB, java.math.BigDecimal decisioninputs1_numC, decisioninputs1.type.TA decisioninputs1_structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number decisioninputs1_numB, java.lang.Number decisioninputs1_numC, decisioninputs1.type.TA decisioninputs1_structA, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'priceInRange'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -67,8 +67,8 @@ public String apply(java.math.BigDecimal decisioninputs1_numB, java.math.BigDeci
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal decisioninputs1_numB = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal decisioninputs1_numC = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number decisioninputs1_numB = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number decisioninputs1_numC = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 decisioninputs1.type.TA decisioninputs1_structA = 2 < args_.length ? (decisioninputs1.type.TA) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -96,7 +96,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal decisioninputs1_numB, java.math.BigDecimal decisioninputs1_numC, decisioninputs1.type.TA decisioninputs1_structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number decisioninputs1_numB, java.lang.Number decisioninputs1_numC, decisioninputs1.type.TA decisioninputs1_structA, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -110,7 +110,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal decisioninputs1_
         // Apply rule
         PriceInRangeRuleOutput output_ = new PriceInRangeRuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            booleanAnd(numericGreaterEqualThan(((java.math.BigDecimal)(decisioninputs1_structA != null ? decisioninputs1_structA.getPrice() : null)), decisioninputs1_numB), numericLessEqualThan(((java.math.BigDecimal)(decisioninputs1_structA != null ? decisioninputs1_structA.getPrice() : null)), decisioninputs1_numC))
+            booleanAnd(numericGreaterEqualThan(((java.lang.Number)(decisioninputs1_structA != null ? decisioninputs1_structA.getPrice() : null)), decisioninputs1_numB), numericLessEqualThan(((java.lang.Number)(decisioninputs1_structA != null ? decisioninputs1_structA.getPrice() : null)), decisioninputs1_numC))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -128,7 +128,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal decisioninputs1_
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal decisioninputs1_numB, java.math.BigDecimal decisioninputs1_numC, decisioninputs1.type.TA decisioninputs1_structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number decisioninputs1_numB, java.lang.Number decisioninputs1_numC, decisioninputs1.type.TA decisioninputs1_structA, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/C.java b/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/C.java
index 68fe16f1b..867abcf61 100644
--- a/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/C.java
+++ b/dmn-test-cases/standard/composite/1.2/0009-type-name-conflicts/translator/expected/java/dmn/C.java
@@ -36,7 +36,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal aa, String ba, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number aa, String ba, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'c'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -65,7 +65,7 @@ public String apply(java.math.BigDecimal aa, String ba, com.gs.dmn.runtime.Execu
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal aa = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number aa = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String ba = 1 < args_.length ? (String) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
diff --git a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_a/Bkm.java b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_a/Bkm.java
index 09c4c3059..2d99f7965 100644
--- a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_a/Bkm.java
+++ b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_a/Bkm.java
@@ -44,7 +44,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal x, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number x, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -72,7 +72,7 @@ public String apply(java.math.BigDecimal x, com.gs.dmn.runtime.ExecutionContext
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal x = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number x = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_c/C.java b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_c/C.java
index e232a2bd9..5fb203e53 100644
--- a/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_c/C.java
+++ b/dmn-test-cases/standard/composite/1.2/0010-bkm-name-conflicts/translator/expected/java/dmn/model_c/C.java
@@ -37,7 +37,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal aa, String ba, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number aa, String ba, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'c'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,7 +66,7 @@ public String apply(java.math.BigDecimal aa, String ba, com.gs.dmn.runtime.Execu
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal aa = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number aa = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String ba = 1 < args_.length ? (String) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
diff --git a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassification.java b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassification.java
index 9899a3c4d..b72e7979b 100644
--- a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassification.java
+++ b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassification.java
@@ -106,7 +106,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(type.Student student, com.gs.dmn.runt
         // Apply rule
         AgeClassificationRuleOutput output_ = new AgeClassificationRuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericLessThan(((java.math.BigDecimal)(student != null ? student.getAge() : null)), number("18"))
+            numericLessThan(((java.lang.Number)(student != null ? student.getAge() : null)), number("18"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -138,7 +138,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(type.Student student, com.gs.dmn.runt
         // Apply rule
         AgeClassificationRuleOutput output_ = new AgeClassificationRuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            booleanAnd(numericGreaterEqualThan(((java.math.BigDecimal)(student != null ? student.getAge() : null)), number("18")), numericLessThan(((java.math.BigDecimal)(student != null ? student.getAge() : null)), number("65")))
+            booleanAnd(numericGreaterEqualThan(((java.lang.Number)(student != null ? student.getAge() : null)), number("18")), numericLessThan(((java.lang.Number)(student != null ? student.getAge() : null)), number("65")))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -170,7 +170,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(type.Student student, com.gs.dmn.runt
         // Apply rule
         AgeClassificationRuleOutput output_ = new AgeClassificationRuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericGreaterEqualThan(((java.math.BigDecimal)(student != null ? student.getAge() : null)), number("65"))
+            numericGreaterEqualThan(((java.lang.Number)(student != null ? student.getAge() : null)), number("65"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
diff --git a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassificationRuleOutput.java b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassificationRuleOutput.java
index db15cba5a..2ec528e06 100644
--- a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassificationRuleOutput.java
+++ b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/AgeClassificationRuleOutput.java
@@ -4,7 +4,7 @@
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "ageClassification"})
 public class AgeClassificationRuleOutput extends com.gs.dmn.runtime.RuleOutput {
     private String cls;
-    private java.math.BigDecimal discount;
+    private java.lang.Number discount;
 
     public AgeClassificationRuleOutput(boolean matched) {
         super(matched);
@@ -20,12 +20,12 @@ public void setCls(String cls) {
         this.cls = cls;
     }
     @com.fasterxml.jackson.annotation.JsonGetter("discount")
-    public java.math.BigDecimal getDiscount() {
+    public java.lang.Number getDiscount() {
         return this.discount;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("discount")
-    public void setDiscount(java.math.BigDecimal discount) {
+    public void setDiscount(java.lang.Number discount) {
         this.discount = discount;
     }
 
diff --git a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/CalculateDiscountedPrice.java b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/CalculateDiscountedPrice.java
index a739ec781..9a53f3f9d 100644
--- a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/CalculateDiscountedPrice.java
+++ b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/CalculateDiscountedPrice.java
@@ -34,7 +34,7 @@ public CalculateDiscountedPrice(AgeClassification ageClassification) {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("price") != null ? number(input_.get("price")) : null), (input_.get("student") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("student"), new com.fasterxml.jackson.core.type.TypeReference<type.StudentImpl>() {}) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal price, type.Student student, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number price, type.Student student, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'calculateDiscountedPrice'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -57,7 +57,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal price, type.Student stude
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, calculateDiscountedPriceArguments_);
 
             // Evaluate decision 'calculateDiscountedPrice'
-            java.math.BigDecimal output_ = lambda.apply(price, student, context_);
+            java.lang.Number output_ = lambda.apply(price, student, context_);
 
             // End decision 'calculateDiscountedPrice'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, calculateDiscountedPriceArguments_, output_, (System.currentTimeMillis() - calculateDiscountedPriceStartTime_));
@@ -69,10 +69,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal price, type.Student stude
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal price = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number price = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 type.Student student = 1 < args_.length ? (type.Student) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -83,7 +83,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 // Apply child decisions
                 com.gs.dmn.runtime.Context ageClassification = CalculateDiscountedPrice.this.ageClassification.apply(student, context_);
 
-                return numericMultiply(price, ((java.math.BigDecimal)((com.gs.dmn.runtime.Context)ageClassification).get("discount")));
+                return numericMultiply(price, ((java.lang.Number)((com.gs.dmn.runtime.Context)ageClassification).get("discount")));
             }
         };
 }
diff --git a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/type/Student.java b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/type/Student.java
index ccba99be7..c802e6b5a 100644
--- a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/type/Student.java
+++ b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/type/Student.java
@@ -14,7 +14,7 @@ static Student toStudent(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             StudentImpl result_ = new StudentImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("age")) {
-                result_.setAge((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("age"));
+                result_.setAge((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("age"));
             } else {
                 return  null;
             }
@@ -32,7 +32,7 @@ static Student toStudent(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("age")
-    java.math.BigDecimal getAge();
+    java.lang.Number getAge();
 
     @com.fasterxml.jackson.annotation.JsonGetter("classification")
     String getClassification();
diff --git a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/type/StudentImpl.java b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/type/StudentImpl.java
index a817213cc..4040eed68 100644
--- a/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/type/StudentImpl.java
+++ b/dmn-test-cases/standard/other/1.2/composite-decision-type-any/translator/expected/java/dmn/type/StudentImpl.java
@@ -5,24 +5,24 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "Student"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class StudentImpl implements Student {
-        private java.math.BigDecimal age;
+        private java.lang.Number age;
         private String classification;
 
     public StudentImpl() {
     }
 
-    public StudentImpl(java.math.BigDecimal age, String classification) {
+    public StudentImpl(java.lang.Number age, String classification) {
         this.setAge(age);
         this.setClassification(classification);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("age")
-    public java.math.BigDecimal getAge() {
+    public java.lang.Number getAge() {
         return this.age;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("age")
-    public void setAge(java.math.BigDecimal age) {
+    public void setAge(java.lang.Number age) {
         this.age = age;
     }
 
diff --git a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/PriceGt10.java b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/PriceGt10.java
index c18c02bfa..a3ba17c87 100644
--- a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/PriceGt10.java
+++ b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/PriceGt10.java
@@ -105,7 +105,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(type.TA structA, com.gs.dmn.runtime.E
         // Apply rule
         PriceGt10RuleOutput output_ = new PriceGt10RuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericGreaterThan(((java.math.BigDecimal)(structA != null ? structA.getPrice() : null)), number("10"))
+            numericGreaterThan(((java.lang.Number)(structA != null ? structA.getPrice() : null)), number("10"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -116,7 +116,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(type.TA structA, com.gs.dmn.runtime.E
 
             // Add annotations
             annotationSet_.addAnnotation("priceGt10", 0, "Logging");
-            annotationSet_.addAnnotation("priceGt10", 0, stringJoin(asList("Price ", string(((java.math.BigDecimal)(structA != null ? structA.getPrice() : null))), " is >= 0"), " "));
+            annotationSet_.addAnnotation("priceGt10", 0, stringJoin(asList("Price ", string(((java.lang.Number)(structA != null ? structA.getPrice() : null))), " is >= 0"), " "));
         }
 
         // Rule end
@@ -140,7 +140,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(type.TA structA, com.gs.dmn.runtime.E
         // Apply rule
         PriceGt10RuleOutput output_ = new PriceGt10RuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericLessEqualThan(((java.math.BigDecimal)(structA != null ? structA.getPrice() : null)), number("10"))
+            numericLessEqualThan(((java.lang.Number)(structA != null ? structA.getPrice() : null)), number("10"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -150,7 +150,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(type.TA structA, com.gs.dmn.runtime.E
             output_.setPriceGt10(Boolean.FALSE);
 
             // Add annotations
-            annotationSet_.addAnnotation("priceGt10", 1, stringAdd(stringAdd("Price ", string(((java.math.BigDecimal)(structA != null ? structA.getPrice() : null)))), " is <= 0"));
+            annotationSet_.addAnnotation("priceGt10", 1, stringAdd(stringAdd("Price ", string(((java.lang.Number)(structA != null ? structA.getPrice() : null)))), " is <= 0"));
             annotationSet_.addAnnotation("priceGt10", 1, "Since this is a CDATA section I can use all sorts of reserved characters like > < \" and & or write things like <foo></bar> but my document is still well formed!");
         }
 
diff --git a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/type/TA.java b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/type/TA.java
index 2d334f35f..d4c84e8ee 100644
--- a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/type/TA.java
+++ b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/type/TA.java
@@ -19,7 +19,7 @@ static TA toTA(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("price")) {
-                result_.setPrice((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("price"));
+                result_.setPrice((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("price"));
             } else {
                 return  null;
             }
@@ -35,7 +35,7 @@ static TA toTA(Object other) {
     String getName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    java.math.BigDecimal getPrice();
+    java.lang.Number getPrice();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/type/TAImpl.java b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/type/TAImpl.java
index 89b2e0b68..98ac206ea 100644
--- a/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/type/TAImpl.java
+++ b/dmn-test-cases/standard/other/1.4/decision-table-with-annotations/translator/expected/java/dmn/type/TAImpl.java
@@ -6,12 +6,12 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TAImpl implements TA {
         private String name;
-        private java.math.BigDecimal price;
+        private java.lang.Number price;
 
     public TAImpl() {
     }
 
-    public TAImpl(String name, java.math.BigDecimal price) {
+    public TAImpl(String name, java.lang.Number price) {
         this.setName(name);
         this.setPrice(price);
     }
@@ -27,12 +27,12 @@ public void setName(String name) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    public java.math.BigDecimal getPrice() {
+    public java.lang.Number getPrice() {
         return this.price;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("price")
-    public void setPrice(java.math.BigDecimal price) {
+    public void setPrice(java.lang.Number price) {
         this.price = price;
     }
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/AffordabilityCalculation.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/AffordabilityCalculation.java
index ca29b9ce4..17615e7f4 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/AffordabilityCalculation.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/AffordabilityCalculation.java
@@ -43,7 +43,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(java.math.BigDecimal monthlyIncome, java.math.BigDecimal monthlyRepayments, java.math.BigDecimal monthlyExpenses, String riskCategory, java.math.BigDecimal requiredMonthlyInstallment, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.lang.Number monthlyIncome, java.lang.Number monthlyRepayments, java.lang.Number monthlyExpenses, String riskCategory, java.lang.Number requiredMonthlyInstallment, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'AffordabilityCalculation'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -75,19 +75,19 @@ public Boolean apply(java.math.BigDecimal monthlyIncome, java.math.BigDecimal mo
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                java.math.BigDecimal monthlyIncome = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal monthlyRepayments = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal monthlyExpenses = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number monthlyIncome = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number monthlyRepayments = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number monthlyExpenses = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 String riskCategory = 3 < args_.length ? (String) args_[3] : null;
-                java.math.BigDecimal requiredMonthlyInstallment = 4 < args_.length ? (java.math.BigDecimal) args_[4] : null;
+                java.lang.Number requiredMonthlyInstallment = 4 < args_.length ? (java.lang.Number) args_[4] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 5 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[5] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                java.math.BigDecimal disposableIncome = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments));
-                java.math.BigDecimal creditContingencyFactor = CreditContingencyFactorTable.instance().apply(riskCategory, context_);
+                java.lang.Number disposableIncome = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments));
+                java.lang.Number creditContingencyFactor = CreditContingencyFactorTable.instance().apply(riskCategory, context_);
                 Boolean affordability = (booleanEqual(numericGreaterThan(numericMultiply(disposableIncome, creditContingencyFactor), requiredMonthlyInstallment), Boolean.TRUE)) ? Boolean.TRUE : Boolean.FALSE;
                 return affordability;
             }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScore.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScore.java
index 592e2195d..71a284c9f 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScore.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScore.java
@@ -33,7 +33,7 @@ public static java.util.Map<String, Object> requestToMap(proto.ApplicationRiskSc
         return map_;
     }
 
-    public static java.math.BigDecimal responseToOutput(proto.ApplicationRiskScoreResponse applicationRiskScoreResponse_) {
+    public static java.lang.Number responseToOutput(proto.ApplicationRiskScoreResponse applicationRiskScoreResponse_) {
         // Extract and convert output
         return java.math.BigDecimal.valueOf(applicationRiskScoreResponse_.getApplicationRiskScore());
     }
@@ -42,7 +42,7 @@ public ApplicationRiskScore() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("ApplicantData") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("ApplicantData"), new com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) : null), context_);
         } catch (Exception e) {
@@ -51,7 +51,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TApplicantData applicantData, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'ApplicationRiskScore'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -65,7 +65,7 @@ public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.
 
             if (cache_.contains("ApplicationRiskScore")) {
                 // Retrieve value from cache
-                java.math.BigDecimal output_ = (java.math.BigDecimal)cache_.lookup("ApplicationRiskScore");
+                java.lang.Number output_ = (java.lang.Number)cache_.lookup("ApplicationRiskScore");
 
                 // End decision 'ApplicationRiskScore'
                 eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreStartTime_));
@@ -73,7 +73,7 @@ public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.
                 return output_;
             } else {
                 // Evaluate decision 'ApplicationRiskScore'
-                java.math.BigDecimal output_ = lambda.apply(applicantData, context_);
+                java.lang.Number output_ = lambda.apply(applicantData, context_);
                 cache_.bind("ApplicationRiskScore", output_);
 
                 // End decision 'ApplicationRiskScore'
@@ -92,7 +92,7 @@ public proto.ApplicationRiskScoreResponse applyProto(proto.ApplicationRiskScoreR
         type.TApplicantData applicantData = type.TApplicantData.toTApplicantData(applicationRiskScoreRequest_.getApplicantData());
 
         // Invoke apply method
-        java.math.BigDecimal output_ = apply(applicantData, context_);
+        java.lang.Number output_ = apply(applicantData, context_);
 
         // Convert output to Response Message
         proto.ApplicationRiskScoreResponse.Builder builder_ = proto.ApplicationRiskScoreResponse.newBuilder();
@@ -101,9 +101,9 @@ public proto.ApplicationRiskScoreResponse applyProto(proto.ApplicationRiskScoreR
         return builder_.build();
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TApplicantData applicantData = 0 < args_.length ? (type.TApplicantData) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -111,7 +111,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return ApplicationRiskScoreModel.instance().apply(((java.math.BigDecimal)(applicantData != null ? applicantData.getAge() : null)), ((String)(applicantData != null ? applicantData.getMaritalStatus() : null)), ((String)(applicantData != null ? applicantData.getEmploymentStatus() : null)), context_);
+                return ApplicationRiskScoreModel.instance().apply(((java.lang.Number)(applicantData != null ? applicantData.getAge() : null)), ((String)(applicantData != null ? applicantData.getMaritalStatus() : null)), ((String)(applicantData != null ? applicantData.getEmploymentStatus() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModel.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModel.java
index 71c3b7362..eb4b9849e 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModel.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModel.java
@@ -34,7 +34,7 @@ private ApplicationRiskScoreModel() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), input_.get("MaritalStatus"), input_.get("EmploymentStatus"), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'ApplicationRiskScoreModel'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -58,7 +58,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_);
 
             // Evaluate BKM 'ApplicationRiskScoreModel'
-            java.math.BigDecimal output_ = lambda.apply(age, maritalStatus, employmentStatus, context_);
+            java.lang.Number output_ = lambda.apply(age, maritalStatus, employmentStatus, context_);
 
             // End BKM 'ApplicationRiskScoreModel'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreModelStartTime_));
@@ -70,10 +70,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String maritalStatus = 1 < args_.length ? (String) args_[1] : null;
                 String employmentStatus = 2 < args_.length ? (String) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
@@ -97,7 +97,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule10(age, maritalStatus, employmentStatus, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = null;
@@ -111,7 +111,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -144,7 +144,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -177,7 +177,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -210,7 +210,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -243,7 +243,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -276,7 +276,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -309,7 +309,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -342,7 +342,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
@@ -375,7 +375,7 @@ public com.gs.dmn.runtime.RuleOutput rule7(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule8(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule8(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(8, "");
 
@@ -408,7 +408,7 @@ public com.gs.dmn.runtime.RuleOutput rule8(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule9(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule9(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(9, "");
 
@@ -441,7 +441,7 @@ public com.gs.dmn.runtime.RuleOutput rule9(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule10(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule10(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(10, "");
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModelRuleOutput.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModelRuleOutput.java
index e8adf1871..6a3e2bbe9 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModelRuleOutput.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/ApplicationRiskScoreModelRuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "ApplicationRiskScoreModel"})
 public class ApplicationRiskScoreModelRuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal applicationRiskScoreModel;
+    private java.lang.Number applicationRiskScoreModel;
 
     public ApplicationRiskScoreModelRuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("ApplicationRiskScoreModel")
-    public java.math.BigDecimal getApplicationRiskScoreModel() {
+    public java.lang.Number getApplicationRiskScoreModel() {
         return this.applicationRiskScoreModel;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("ApplicationRiskScoreModel")
-    public void setApplicationRiskScoreModel(java.math.BigDecimal applicationRiskScoreModel) {
+    public void setApplicationRiskScoreModel(java.lang.Number applicationRiskScoreModel) {
         this.applicationRiskScoreModel = applicationRiskScoreModel;
     }
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTable.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTable.java
index 39988fd1e..e95815237 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTable.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTable.java
@@ -34,7 +34,7 @@ private CreditContingencyFactorTable() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(input_.get("RiskCategory"), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(String riskCategory, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'CreditContingencyFactorTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.Execut
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_);
 
             // Evaluate BKM 'CreditContingencyFactorTable'
-            java.math.BigDecimal output_ = lambda.apply(riskCategory, context_);
+            java.lang.Number output_ = lambda.apply(riskCategory, context_);
 
             // End BKM 'CreditContingencyFactorTable'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_, output_, (System.currentTimeMillis() - creditContingencyFactorTableStartTime_));
@@ -68,9 +68,9 @@ public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.Execut
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 String riskCategory = 0 < args_.length ? (String) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -85,7 +85,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule2(riskCategory, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = null;
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTableRuleOutput.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTableRuleOutput.java
index cf2beb095..43b9e8e1b 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTableRuleOutput.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/CreditContingencyFactorTableRuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "CreditContingencyFactorTable"})
 public class CreditContingencyFactorTableRuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal creditContingencyFactorTable;
+    private java.lang.Number creditContingencyFactorTable;
 
     public CreditContingencyFactorTableRuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditContingencyFactorTable")
-    public java.math.BigDecimal getCreditContingencyFactorTable() {
+    public java.lang.Number getCreditContingencyFactorTable() {
         return this.creditContingencyFactorTable;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("CreditContingencyFactorTable")
-    public void setCreditContingencyFactorTable(java.math.BigDecimal creditContingencyFactorTable) {
+    public void setCreditContingencyFactorTable(java.lang.Number creditContingencyFactorTable) {
         this.creditContingencyFactorTable = creditContingencyFactorTable;
     }
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Eligibility.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Eligibility.java
index 89503b5c9..48376b33d 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Eligibility.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Eligibility.java
@@ -118,7 +118,7 @@ public String apply(Object... args_) {
                 Boolean preBureauAffordability = Eligibility.this.preBureauAffordability.apply(applicantData, requestedProduct, context_);
                 String preBureauRiskCategory = Eligibility.this.preBureauRiskCategory.apply(applicantData, context_);
 
-                return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, ((java.math.BigDecimal)(applicantData != null ? applicantData.getAge() : null)), context_);
+                return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, ((java.lang.Number)(applicantData != null ? applicantData.getAge() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/EligibilityRules.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/EligibilityRules.java
index c186e78a1..b048cdbb0 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/EligibilityRules.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/EligibilityRules.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'EligibilityRules'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -75,7 +75,7 @@ public String apply(String preBureauRiskCategory, Boolean preBureauAffordability
             public String apply(Object... args_) {
                 String preBureauRiskCategory = 0 < args_.length ? (String) args_[0] : null;
                 Boolean preBureauAffordability = 1 < args_.length ? (Boolean) args_[1] : null;
-                java.math.BigDecimal age = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number age = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -104,7 +104,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -138,7 +138,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -172,7 +172,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -206,7 +206,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/InstallmentCalculation.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/InstallmentCalculation.java
index cd3e17db3..858b65624 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/InstallmentCalculation.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/InstallmentCalculation.java
@@ -34,7 +34,7 @@ private InstallmentCalculation() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(input_.get("ProductType"), (input_.get("Rate") != null ? number(input_.get("Rate")) : null), (input_.get("Term") != null ? number(input_.get("Term")) : null), (input_.get("Amount") != null ? number(input_.get("Amount")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate, java.math.BigDecimal term, java.math.BigDecimal amount, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(String productType, java.lang.Number rate, java.lang.Number term, java.lang.Number amount, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'InstallmentCalculation'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -59,7 +59,7 @@ public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate,
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_);
 
             // Evaluate BKM 'InstallmentCalculation'
-            java.math.BigDecimal output_ = lambda.apply(productType, rate, term, amount, context_);
+            java.lang.Number output_ = lambda.apply(productType, rate, term, amount, context_);
 
             // End BKM 'InstallmentCalculation'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_, output_, (System.currentTimeMillis() - installmentCalculationStartTime_));
@@ -71,21 +71,21 @@ public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate,
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 String productType = 0 < args_.length ? (String) args_[0] : null;
-                java.math.BigDecimal rate = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal term = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
-                java.math.BigDecimal amount = 3 < args_.length ? (java.math.BigDecimal) args_[3] : null;
+                java.lang.Number rate = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number term = 2 < args_.length ? (java.lang.Number) args_[2] : null;
+                java.lang.Number amount = 3 < args_.length ? (java.lang.Number) args_[3] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 4 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[4] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                java.math.BigDecimal monthlyFee = (booleanEqual(stringEqual(productType, "STANDARD LOAN"), Boolean.TRUE)) ? number("20.00") : (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), Boolean.TRUE)) ? number("25.00") : null;
-                java.math.BigDecimal monthlyRepayment = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term))));
+                java.lang.Number monthlyFee = (booleanEqual(stringEqual(productType, "STANDARD LOAN"), Boolean.TRUE)) ? number("20.00") : (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), Boolean.TRUE)) ? number("25.00") : null;
+                java.lang.Number monthlyRepayment = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term))));
                 return numericAdd(monthlyRepayment, monthlyFee);
             }
         };
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauAffordability.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauAffordability.java
index cb1f8417b..17a12febb 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauAffordability.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauAffordability.java
@@ -121,9 +121,9 @@ public Boolean apply(Object... args_) {
 
                 // Apply child decisions
                 String postBureauRiskCategory = PostBureauAffordability.this.postBureauRiskCategory.apply(applicantData, bureauData, context_);
-                java.math.BigDecimal requiredMonthlyInstallment = PostBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
+                java.lang.Number requiredMonthlyInstallment = PostBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
 
-                return AffordabilityCalculation.instance().apply(((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), postBureauRiskCategory, requiredMonthlyInstallment, context_);
+                return AffordabilityCalculation.instance().apply(((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), postBureauRiskCategory, requiredMonthlyInstallment, context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategory.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategory.java
index 1344ce0f3..06f0b9a0b 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategory.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategory.java
@@ -124,9 +124,9 @@ public String apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal applicationRiskScore = PostBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
+                java.lang.Number applicationRiskScore = PostBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
 
-                return PostBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, ((java.math.BigDecimal)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
+                return PostBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, ((java.lang.Number)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategoryTable.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategoryTable.java
index ec2e18c1c..7e474c4ff 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PostBureauRiskCategoryTable.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'Post-bureauRiskCategoryTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -74,8 +74,8 @@ public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRi
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
                 Boolean existingCustomer = 0 < args_.length ? (Boolean) args_[0] : null;
-                java.math.BigDecimal applicationRiskScore = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal creditScore = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number applicationRiskScore = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number creditScore = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -113,7 +113,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -146,7 +146,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -179,7 +179,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -212,7 +212,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -245,7 +245,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -278,7 +278,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -311,7 +311,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -344,7 +344,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
@@ -377,7 +377,7 @@ public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(8, "");
 
@@ -410,7 +410,7 @@ public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(9, "");
 
@@ -443,7 +443,7 @@ public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(10, "");
 
@@ -476,7 +476,7 @@ public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.math.
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 11, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(11, "");
 
@@ -509,7 +509,7 @@ public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.math.
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 12, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule12(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule12(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(12, "");
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauAffordability.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauAffordability.java
index d5a9090b6..1df31666f 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauAffordability.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauAffordability.java
@@ -116,9 +116,9 @@ public Boolean apply(Object... args_) {
 
                 // Apply child decisions
                 String preBureauRiskCategory = PreBureauAffordability.this.preBureauRiskCategory.apply(applicantData, context_);
-                java.math.BigDecimal requiredMonthlyInstallment = PreBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
+                java.lang.Number requiredMonthlyInstallment = PreBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
 
-                return AffordabilityCalculation.instance().apply(((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), preBureauRiskCategory, requiredMonthlyInstallment, context_);
+                return AffordabilityCalculation.instance().apply(((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), preBureauRiskCategory, requiredMonthlyInstallment, context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategory.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategory.java
index 97edec3e2..879b754cc 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategory.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategory.java
@@ -119,7 +119,7 @@ public String apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal applicationRiskScore = PreBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
+                java.lang.Number applicationRiskScore = PreBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
 
                 return PreBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, context_);
             }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategoryTable.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategoryTable.java
index 5ce913feb..8bf4edd5e 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/PreBureauRiskCategoryTable.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'Pre-bureauRiskCategoryTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -73,7 +73,7 @@ public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRi
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
                 Boolean existingCustomer = 0 < args_.length ? (Boolean) args_[0] : null;
-                java.math.BigDecimal applicationRiskScore = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number applicationRiskScore = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -106,7 +106,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -138,7 +138,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -170,7 +170,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -202,7 +202,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -234,7 +234,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -266,7 +266,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -298,7 +298,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -330,7 +330,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RequiredMonthlyInstallment.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RequiredMonthlyInstallment.java
index 72452d7f9..29c26dca1 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RequiredMonthlyInstallment.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RequiredMonthlyInstallment.java
@@ -33,7 +33,7 @@ public static java.util.Map<String, Object> requestToMap(proto.RequiredMonthlyIn
         return map_;
     }
 
-    public static java.math.BigDecimal responseToOutput(proto.RequiredMonthlyInstallmentResponse requiredMonthlyInstallmentResponse_) {
+    public static java.lang.Number responseToOutput(proto.RequiredMonthlyInstallmentResponse requiredMonthlyInstallmentResponse_) {
         // Extract and convert output
         return java.math.BigDecimal.valueOf(requiredMonthlyInstallmentResponse_.getRequiredMonthlyInstallment());
     }
@@ -42,7 +42,7 @@ public RequiredMonthlyInstallment() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("RequestedProduct") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("RequestedProduct"), new com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) : null), context_);
         } catch (Exception e) {
@@ -51,7 +51,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TRequestedProduct requestedProduct, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'RequiredMonthlyInstallment'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -65,7 +65,7 @@ public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.g
 
             if (cache_.contains("RequiredMonthlyInstallment")) {
                 // Retrieve value from cache
-                java.math.BigDecimal output_ = (java.math.BigDecimal)cache_.lookup("RequiredMonthlyInstallment");
+                java.lang.Number output_ = (java.lang.Number)cache_.lookup("RequiredMonthlyInstallment");
 
                 // End decision 'RequiredMonthlyInstallment'
                 eventListener_.endDRGElement(DRG_ELEMENT_METADATA, requiredMonthlyInstallmentArguments_, output_, (System.currentTimeMillis() - requiredMonthlyInstallmentStartTime_));
@@ -73,7 +73,7 @@ public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.g
                 return output_;
             } else {
                 // Evaluate decision 'RequiredMonthlyInstallment'
-                java.math.BigDecimal output_ = lambda.apply(requestedProduct, context_);
+                java.lang.Number output_ = lambda.apply(requestedProduct, context_);
                 cache_.bind("RequiredMonthlyInstallment", output_);
 
                 // End decision 'RequiredMonthlyInstallment'
@@ -92,7 +92,7 @@ public proto.RequiredMonthlyInstallmentResponse applyProto(proto.RequiredMonthly
         type.TRequestedProduct requestedProduct = type.TRequestedProduct.toTRequestedProduct(requiredMonthlyInstallmentRequest_.getRequestedProduct());
 
         // Invoke apply method
-        java.math.BigDecimal output_ = apply(requestedProduct, context_);
+        java.lang.Number output_ = apply(requestedProduct, context_);
 
         // Convert output to Response Message
         proto.RequiredMonthlyInstallmentResponse.Builder builder_ = proto.RequiredMonthlyInstallmentResponse.newBuilder();
@@ -101,9 +101,9 @@ public proto.RequiredMonthlyInstallmentResponse applyProto(proto.RequiredMonthly
         return builder_.build();
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TRequestedProduct requestedProduct = 0 < args_.length ? (type.TRequestedProduct) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -111,7 +111,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return InstallmentCalculation.instance().apply(((String)(requestedProduct != null ? requestedProduct.getProductType() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getRate() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getTerm() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getAmount() : null)), context_);
+                return InstallmentCalculation.instance().apply(((String)(requestedProduct != null ? requestedProduct.getProductType() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getRate() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getTerm() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getAmount() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Routing.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Routing.java
index 507a3ce9d..b96a8f1bd 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Routing.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/Routing.java
@@ -123,7 +123,7 @@ public String apply(Object... args_) {
                 Boolean postBureauAffordability = Routing.this.postBureauAffordability.apply(applicantData, bureauData, requestedProduct, context_);
                 String postBureauRiskCategory = Routing.this.postBureauRiskCategory.apply(applicantData, bureauData, context_);
 
-                return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, ((Boolean)(bureauData != null ? bureauData.getBankrupt() : null)), ((java.math.BigDecimal)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
+                return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, ((Boolean)(bureauData != null ? bureauData.getBankrupt() : null)), ((java.lang.Number)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RoutingRules.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RoutingRules.java
index 787d9d796..4e7987574 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RoutingRules.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/RoutingRules.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'RoutingRules'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -77,7 +77,7 @@ public String apply(Object... args_) {
                 String postBureauRiskCategory = 0 < args_.length ? (String) args_[0] : null;
                 Boolean postBureauAffordability = 1 < args_.length ? (Boolean) args_[1] : null;
                 Boolean bankrupt = 2 < args_.length ? (Boolean) args_[2] : null;
-                java.math.BigDecimal creditScore = 3 < args_.length ? (java.math.BigDecimal) args_[3] : null;
+                java.lang.Number creditScore = 3 < args_.length ? (java.lang.Number) args_[3] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 4 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[4] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -107,7 +107,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -142,7 +142,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -177,7 +177,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -212,7 +212,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -247,7 +247,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/Monthly.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/Monthly.java
index ab0ae706f..b3b027932 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/Monthly.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/Monthly.java
@@ -14,17 +14,17 @@ static Monthly toMonthly(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             MonthlyImpl result_ = new MonthlyImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Income")) {
-                result_.setIncome((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Income"));
+                result_.setIncome((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Income"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Expenses")) {
-                result_.setExpenses((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Expenses"));
+                result_.setExpenses((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Expenses"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Repayments")) {
-                result_.setRepayments((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Repayments"));
+                result_.setRepayments((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Repayments"));
             } else {
                 return  null;
             }
@@ -64,13 +64,13 @@ static List<proto.Monthly> toProto(List<Monthly> other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Income")
-    java.math.BigDecimal getIncome();
+    java.lang.Number getIncome();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Expenses")
-    java.math.BigDecimal getExpenses();
+    java.lang.Number getExpenses();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Repayments")
-    java.math.BigDecimal getRepayments();
+    java.lang.Number getRepayments();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/MonthlyImpl.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/MonthlyImpl.java
index 35524f46f..176a0ffb7 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/MonthlyImpl.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/MonthlyImpl.java
@@ -5,46 +5,46 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "Monthly"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class MonthlyImpl implements Monthly {
-        private java.math.BigDecimal income;
-        private java.math.BigDecimal expenses;
-        private java.math.BigDecimal repayments;
+        private java.lang.Number income;
+        private java.lang.Number expenses;
+        private java.lang.Number repayments;
 
     public MonthlyImpl() {
     }
 
-    public MonthlyImpl(java.math.BigDecimal expenses, java.math.BigDecimal income, java.math.BigDecimal repayments) {
+    public MonthlyImpl(java.lang.Number expenses, java.lang.Number income, java.lang.Number repayments) {
         this.setExpenses(expenses);
         this.setIncome(income);
         this.setRepayments(repayments);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Expenses")
-    public java.math.BigDecimal getExpenses() {
+    public java.lang.Number getExpenses() {
         return this.expenses;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Expenses")
-    public void setExpenses(java.math.BigDecimal expenses) {
+    public void setExpenses(java.lang.Number expenses) {
         this.expenses = expenses;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Income")
-    public java.math.BigDecimal getIncome() {
+    public java.lang.Number getIncome() {
         return this.income;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Income")
-    public void setIncome(java.math.BigDecimal income) {
+    public void setIncome(java.lang.Number income) {
         this.income = income;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Repayments")
-    public java.math.BigDecimal getRepayments() {
+    public java.lang.Number getRepayments() {
         return this.repayments;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Repayments")
-    public void setRepayments(java.math.BigDecimal repayments) {
+    public void setRepayments(java.lang.Number repayments) {
         this.repayments = repayments;
     }
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TApplicantData.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TApplicantData.java
index 6d6d33c79..1e443f826 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TApplicantData.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TApplicantData.java
@@ -19,7 +19,7 @@ static TApplicantData toTApplicantData(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Age")) {
-                result_.setAge((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Age"));
+                result_.setAge((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Age"));
             } else {
                 return  null;
             }
@@ -85,7 +85,7 @@ static List<proto.TApplicantData> toProto(List<TApplicantData> other) {
     type.Monthly getMonthly();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Age")
-    java.math.BigDecimal getAge();
+    java.lang.Number getAge();
 
     @com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer")
     Boolean getExistingCustomer();
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TApplicantDataImpl.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TApplicantDataImpl.java
index 77bbe4d98..afe48d54c 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TApplicantDataImpl.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TApplicantDataImpl.java
@@ -6,7 +6,7 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TApplicantDataImpl implements TApplicantData {
         private type.Monthly monthly;
-        private java.math.BigDecimal age;
+        private java.lang.Number age;
         private Boolean existingCustomer;
         private String maritalStatus;
         private String employmentStatus;
@@ -14,7 +14,7 @@ public class TApplicantDataImpl implements TApplicantData {
     public TApplicantDataImpl() {
     }
 
-    public TApplicantDataImpl(java.math.BigDecimal age, String employmentStatus, Boolean existingCustomer, String maritalStatus, type.Monthly monthly) {
+    public TApplicantDataImpl(java.lang.Number age, String employmentStatus, Boolean existingCustomer, String maritalStatus, type.Monthly monthly) {
         this.setAge(age);
         this.setEmploymentStatus(employmentStatus);
         this.setExistingCustomer(existingCustomer);
@@ -23,12 +23,12 @@ public TApplicantDataImpl(java.math.BigDecimal age, String employmentStatus, Boo
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Age")
-    public java.math.BigDecimal getAge() {
+    public java.lang.Number getAge() {
         return this.age;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Age")
-    public void setAge(java.math.BigDecimal age) {
+    public void setAge(java.lang.Number age) {
         this.age = age;
     }
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TBureauData.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TBureauData.java
index 7de631eda..fc8ec18b2 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TBureauData.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TBureauData.java
@@ -14,7 +14,7 @@ static TBureauData toTBureauData(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TBureauDataImpl result_ = new TBureauDataImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("CreditScore")) {
-                result_.setCreditScore((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("CreditScore"));
+                result_.setCreditScore((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("CreditScore"));
             } else {
                 return  null;
             }
@@ -56,7 +56,7 @@ static List<proto.TBureauData> toProto(List<TBureauData> other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditScore")
-    java.math.BigDecimal getCreditScore();
+    java.lang.Number getCreditScore();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Bankrupt")
     Boolean getBankrupt();
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TBureauDataImpl.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TBureauDataImpl.java
index 7438ce35e..5c3f21c86 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TBureauDataImpl.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TBureauDataImpl.java
@@ -5,13 +5,13 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tBureauData"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TBureauDataImpl implements TBureauData {
-        private java.math.BigDecimal creditScore;
+        private java.lang.Number creditScore;
         private Boolean bankrupt;
 
     public TBureauDataImpl() {
     }
 
-    public TBureauDataImpl(Boolean bankrupt, java.math.BigDecimal creditScore) {
+    public TBureauDataImpl(Boolean bankrupt, java.lang.Number creditScore) {
         this.setBankrupt(bankrupt);
         this.setCreditScore(creditScore);
     }
@@ -27,12 +27,12 @@ public void setBankrupt(Boolean bankrupt) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditScore")
-    public java.math.BigDecimal getCreditScore() {
+    public java.lang.Number getCreditScore() {
         return this.creditScore;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("CreditScore")
-    public void setCreditScore(java.math.BigDecimal creditScore) {
+    public void setCreditScore(java.lang.Number creditScore) {
         this.creditScore = creditScore;
     }
 
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TRequestedProduct.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TRequestedProduct.java
index 2f7ac12fb..243d9f3e2 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TRequestedProduct.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TRequestedProduct.java
@@ -19,17 +19,17 @@ static TRequestedProduct toTRequestedProduct(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Amount")) {
-                result_.setAmount((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Amount"));
+                result_.setAmount((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Amount"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Rate")) {
-                result_.setRate((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Rate"));
+                result_.setRate((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Rate"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Term")) {
-                result_.setTerm((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Term"));
+                result_.setTerm((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Term"));
             } else {
                 return  null;
             }
@@ -75,13 +75,13 @@ static List<proto.TRequestedProduct> toProto(List<TRequestedProduct> other) {
     String getProductType();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Amount")
-    java.math.BigDecimal getAmount();
+    java.lang.Number getAmount();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Rate")
-    java.math.BigDecimal getRate();
+    java.lang.Number getRate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Term")
-    java.math.BigDecimal getTerm();
+    java.lang.Number getTerm();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TRequestedProductImpl.java b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TRequestedProductImpl.java
index 69f7c5d4d..904662ee9 100644
--- a/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TRequestedProductImpl.java
+++ b/dmn-test-cases/standard/proto/1.1/0004-lending/translator/expected/proto3/java/dmn/type/TRequestedProductImpl.java
@@ -6,14 +6,14 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TRequestedProductImpl implements TRequestedProduct {
         private String productType;
-        private java.math.BigDecimal amount;
-        private java.math.BigDecimal rate;
-        private java.math.BigDecimal term;
+        private java.lang.Number amount;
+        private java.lang.Number rate;
+        private java.lang.Number term;
 
     public TRequestedProductImpl() {
     }
 
-    public TRequestedProductImpl(java.math.BigDecimal amount, String productType, java.math.BigDecimal rate, java.math.BigDecimal term) {
+    public TRequestedProductImpl(java.lang.Number amount, String productType, java.lang.Number rate, java.lang.Number term) {
         this.setAmount(amount);
         this.setProductType(productType);
         this.setRate(rate);
@@ -21,12 +21,12 @@ public TRequestedProductImpl(java.math.BigDecimal amount, String productType, ja
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Amount")
-    public java.math.BigDecimal getAmount() {
+    public java.lang.Number getAmount() {
         return this.amount;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Amount")
-    public void setAmount(java.math.BigDecimal amount) {
+    public void setAmount(java.lang.Number amount) {
         this.amount = amount;
     }
 
@@ -41,22 +41,22 @@ public void setProductType(String productType) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Rate")
-    public java.math.BigDecimal getRate() {
+    public java.lang.Number getRate() {
         return this.rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Rate")
-    public void setRate(java.math.BigDecimal rate) {
+    public void setRate(java.lang.Number rate) {
         this.rate = rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Term")
-    public java.math.BigDecimal getTerm() {
+    public java.lang.Number getTerm() {
         return this.term;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Term")
-    public void setTerm(java.math.BigDecimal term) {
+    public void setTerm(java.lang.Number term) {
         this.term = term;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ApprovalStatus.java b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ApprovalStatus.java
index fea9620be..381c2d96e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ApprovalStatus.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0004-simpletable-U/translator/expected/java/dmn/ApprovalStatus.java
@@ -36,7 +36,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Approval Status'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,7 +66,7 @@ public String apply(java.math.BigDecimal age, String riskCategory, Boolean isAff
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String riskCategory = 1 < args_.length ? (String) args_[1] : null;
                 Boolean isAffordable = 2 < args_.length ? (Boolean) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
@@ -97,7 +97,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -130,7 +130,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -163,7 +163,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -196,7 +196,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ApprovalStatus.java b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ApprovalStatus.java
index 7ba8bbc15..1b227b7f1 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ApprovalStatus.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0005-simpletable-A/translator/expected/java/dmn/ApprovalStatus.java
@@ -36,7 +36,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Approval Status'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,7 +66,7 @@ public String apply(java.math.BigDecimal age, String riskCategory, Boolean isAff
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String riskCategory = 1 < args_.length ? (String) args_[1] : null;
                 Boolean isAffordable = 2 < args_.length ? (Boolean) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
@@ -97,7 +97,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -130,7 +130,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -163,7 +163,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -196,7 +196,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ApprovalStatus.java b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ApprovalStatus.java
index 691e90429..09e9a6116 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ApprovalStatus.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0006-simpletable-P1/translator/expected/java/dmn/ApprovalStatus.java
@@ -36,7 +36,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Approval Status'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,7 +66,7 @@ public String apply(java.math.BigDecimal age, String riskCategory, Boolean isAff
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String riskCategory = 1 < args_.length ? (String) args_[1] : null;
                 Boolean isAffordable = 2 < args_.length ? (Boolean) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
@@ -97,7 +97,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -131,7 +131,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -165,7 +165,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -199,7 +199,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ApprovalStatus.java b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ApprovalStatus.java
index fa18bde71..32e4a7fea 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ApprovalStatus.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0007-simpletable-P2/translator/expected/java/dmn/ApprovalStatus.java
@@ -36,7 +36,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Approval Status'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,7 +66,7 @@ public String apply(java.math.BigDecimal age, String riskCategory, Boolean isAff
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String riskCategory = 1 < args_.length ? (String) args_[1] : null;
                 Boolean isAffordable = 2 < args_.length ? (Boolean) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
@@ -95,7 +95,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -129,7 +129,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/Payment.java b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/Payment.java
index a62bc43a1..ce315e7cd 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/Payment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/Payment.java
@@ -27,7 +27,7 @@ public Payment() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("loan") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("loan"), new com.fasterxml.jackson.core.type.TypeReference<type.TLoanImpl>() {}) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TLoan loan, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TLoan loan, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'payment'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -49,7 +49,7 @@ public java.math.BigDecimal apply(type.TLoan loan, com.gs.dmn.runtime.ExecutionC
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, paymentArguments_);
 
             // Evaluate decision 'payment'
-            java.math.BigDecimal output_ = lambda.apply(loan, context_);
+            java.lang.Number output_ = lambda.apply(loan, context_);
 
             // End decision 'payment'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, paymentArguments_, output_, (System.currentTimeMillis() - paymentStartTime_));
@@ -61,9 +61,9 @@ public java.math.BigDecimal apply(type.TLoan loan, com.gs.dmn.runtime.ExecutionC
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TLoan loan = 0 < args_.length ? (type.TLoan) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -71,7 +71,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return numericDivide(numericDivide(numericMultiply(((java.math.BigDecimal)(loan != null ? loan.getPrincipal() : null)), ((java.math.BigDecimal)(loan != null ? loan.getRate() : null))), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(((java.math.BigDecimal)(loan != null ? loan.getRate() : null)), number("12"))), numericUnaryMinus(((java.math.BigDecimal)(loan != null ? loan.getTermMonths() : null))))));
+                return numericDivide(numericDivide(numericMultiply(((java.lang.Number)(loan != null ? loan.getPrincipal() : null)), ((java.lang.Number)(loan != null ? loan.getRate() : null))), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(((java.lang.Number)(loan != null ? loan.getRate() : null)), number("12"))), numericUnaryMinus(((java.lang.Number)(loan != null ? loan.getTermMonths() : null))))));
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/type/TLoan.java b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/type/TLoan.java
index a7ef5cc2c..728d54d8d 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/type/TLoan.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/type/TLoan.java
@@ -14,17 +14,17 @@ static TLoan toTLoan(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TLoanImpl result_ = new TLoanImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("principal")) {
-                result_.setPrincipal((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("principal"));
+                result_.setPrincipal((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("principal"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("rate")) {
-                result_.setRate((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("rate"));
+                result_.setRate((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("rate"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("termMonths")) {
-                result_.setTermMonths((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("termMonths"));
+                result_.setTermMonths((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("termMonths"));
             } else {
                 return  null;
             }
@@ -37,13 +37,13 @@ static TLoan toTLoan(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("principal")
-    java.math.BigDecimal getPrincipal();
+    java.lang.Number getPrincipal();
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    java.math.BigDecimal getRate();
+    java.lang.Number getRate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("termMonths")
-    java.math.BigDecimal getTermMonths();
+    java.lang.Number getTermMonths();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/type/TLoanImpl.java b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/type/TLoanImpl.java
index bf566a67b..f6925d03b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/type/TLoanImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0008-LX-arithmetic/translator/expected/java/dmn/type/TLoanImpl.java
@@ -5,46 +5,46 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tLoan"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TLoanImpl implements TLoan {
-        private java.math.BigDecimal principal;
-        private java.math.BigDecimal rate;
-        private java.math.BigDecimal termMonths;
+        private java.lang.Number principal;
+        private java.lang.Number rate;
+        private java.lang.Number termMonths;
 
     public TLoanImpl() {
     }
 
-    public TLoanImpl(java.math.BigDecimal principal, java.math.BigDecimal rate, java.math.BigDecimal termMonths) {
+    public TLoanImpl(java.lang.Number principal, java.lang.Number rate, java.lang.Number termMonths) {
         this.setPrincipal(principal);
         this.setRate(rate);
         this.setTermMonths(termMonths);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("principal")
-    public java.math.BigDecimal getPrincipal() {
+    public java.lang.Number getPrincipal() {
         return this.principal;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("principal")
-    public void setPrincipal(java.math.BigDecimal principal) {
+    public void setPrincipal(java.lang.Number principal) {
         this.principal = principal;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    public java.math.BigDecimal getRate() {
+    public java.lang.Number getRate() {
         return this.rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("rate")
-    public void setRate(java.math.BigDecimal rate) {
+    public void setRate(java.lang.Number rate) {
         this.rate = rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("termMonths")
-    public java.math.BigDecimal getTermMonths() {
+    public java.lang.Number getTermMonths() {
         return this.termMonths;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("termMonths")
-    public void setTermMonths(java.math.BigDecimal termMonths) {
+    public void setTermMonths(java.lang.Number termMonths) {
         this.termMonths = termMonths;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/MonthlyPayment.java b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/MonthlyPayment.java
index 31301dcd0..2df23d0d9 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/MonthlyPayment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/MonthlyPayment.java
@@ -27,7 +27,7 @@ public MonthlyPayment() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Loan") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("Loan"), new com.fasterxml.jackson.core.type.TypeReference<type.TLoanImpl>() {}) : null), (input_.get("fee") != null ? number(input_.get("fee")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TLoan loan, java.math.BigDecimal fee, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TLoan loan, java.lang.Number fee, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'MonthlyPayment'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -50,7 +50,7 @@ public java.math.BigDecimal apply(type.TLoan loan, java.math.BigDecimal fee, com
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_);
 
             // Evaluate decision 'MonthlyPayment'
-            java.math.BigDecimal output_ = lambda.apply(loan, fee, context_);
+            java.lang.Number output_ = lambda.apply(loan, fee, context_);
 
             // End decision 'MonthlyPayment'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_, output_, (System.currentTimeMillis() - monthlyPaymentStartTime_));
@@ -62,18 +62,18 @@ public java.math.BigDecimal apply(type.TLoan loan, java.math.BigDecimal fee, com
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TLoan loan = 0 < args_.length ? (type.TLoan) args_[0] : null;
-                java.math.BigDecimal fee = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number fee = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return numericAdd(PMT.instance().apply(((java.math.BigDecimal)(loan != null ? loan.getAmount() : null)), ((java.math.BigDecimal)(loan != null ? loan.getRate() : null)), ((java.math.BigDecimal)(loan != null ? loan.getTerm() : null)), context_), fee);
+                return numericAdd(PMT.instance().apply(((java.lang.Number)(loan != null ? loan.getAmount() : null)), ((java.lang.Number)(loan != null ? loan.getRate() : null)), ((java.lang.Number)(loan != null ? loan.getTerm() : null)), context_), fee);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/PMT.java b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/PMT.java
index ad0d5dc39..77a0eb03c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/PMT.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/PMT.java
@@ -34,7 +34,7 @@ private PMT() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("p") != null ? number(input_.get("p")) : null), (input_.get("r") != null ? number(input_.get("r")) : null), (input_.get("n") != null ? number(input_.get("n")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r, java.math.BigDecimal n, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number p, java.lang.Number r, java.lang.Number n, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'PMT'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -58,7 +58,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, pMTArguments_);
 
             // Evaluate BKM 'PMT'
-            java.math.BigDecimal output_ = lambda.apply(p, r, n, context_);
+            java.lang.Number output_ = lambda.apply(p, r, n, context_);
 
             // End BKM 'PMT'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, pMTArguments_, output_, (System.currentTimeMillis() - pMTStartTime_));
@@ -70,12 +70,12 @@ public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal p = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal r = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal n = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number p = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number r = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number n = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/type/TLoan.java b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/type/TLoan.java
index a9c90036f..164d785c5 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/type/TLoan.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/type/TLoan.java
@@ -14,17 +14,17 @@ static TLoan toTLoan(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TLoanImpl result_ = new TLoanImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("amount")) {
-                result_.setAmount((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("amount"));
+                result_.setAmount((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("amount"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("rate")) {
-                result_.setRate((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("rate"));
+                result_.setRate((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("rate"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("term")) {
-                result_.setTerm((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("term"));
+                result_.setTerm((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("term"));
             } else {
                 return  null;
             }
@@ -37,13 +37,13 @@ static TLoan toTLoan(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("amount")
-    java.math.BigDecimal getAmount();
+    java.lang.Number getAmount();
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    java.math.BigDecimal getRate();
+    java.lang.Number getRate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("term")
-    java.math.BigDecimal getTerm();
+    java.lang.Number getTerm();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/type/TLoanImpl.java b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/type/TLoanImpl.java
index 636efed80..bff6f0d60 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/type/TLoanImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0009-invocation-arithmetic/translator/expected/java/dmn/type/TLoanImpl.java
@@ -5,46 +5,46 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tLoan"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TLoanImpl implements TLoan {
-        private java.math.BigDecimal amount;
-        private java.math.BigDecimal rate;
-        private java.math.BigDecimal term;
+        private java.lang.Number amount;
+        private java.lang.Number rate;
+        private java.lang.Number term;
 
     public TLoanImpl() {
     }
 
-    public TLoanImpl(java.math.BigDecimal amount, java.math.BigDecimal rate, java.math.BigDecimal term) {
+    public TLoanImpl(java.lang.Number amount, java.lang.Number rate, java.lang.Number term) {
         this.setAmount(amount);
         this.setRate(rate);
         this.setTerm(term);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("amount")
-    public java.math.BigDecimal getAmount() {
+    public java.lang.Number getAmount() {
         return this.amount;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("amount")
-    public void setAmount(java.math.BigDecimal amount) {
+    public void setAmount(java.lang.Number amount) {
         this.amount = amount;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    public java.math.BigDecimal getRate() {
+    public java.lang.Number getRate() {
         return this.rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("rate")
-    public void setRate(java.math.BigDecimal rate) {
+    public void setRate(java.lang.Number rate) {
         this.rate = rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("term")
-    public java.math.BigDecimal getTerm() {
+    public java.lang.Number getTerm() {
         return this.term;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("term")
-    public void setTerm(java.math.BigDecimal term) {
+    public void setTerm(java.lang.Number term) {
         this.term = term;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/Approval.java b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/Approval.java
index fed8a6946..6ad4a81b8 100644
--- a/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/Approval.java
+++ b/dmn-test-cases/standard/tck/1.1/cl2/0010-multi-output-U/translator/expected/java/dmn/Approval.java
@@ -36,7 +36,7 @@ public type.TApproval applyMap(java.util.Map<String, String> input_, com.gs.dmn.
         }
     }
 
-    public type.TApproval apply(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public type.TApproval apply(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Approval'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,7 +66,7 @@ public type.TApproval apply(java.math.BigDecimal age, String riskCategory, Boole
     public com.gs.dmn.runtime.LambdaExpression<type.TApproval> lambda =
         new com.gs.dmn.runtime.LambdaExpression<type.TApproval>() {
             public type.TApproval apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String riskCategory = 1 < args_.length ? (String) args_[1] : null;
                 Boolean isAffordable = 2 < args_.length ? (Boolean) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
@@ -98,7 +98,7 @@ public type.TApproval apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -132,7 +132,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -166,7 +166,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -200,7 +200,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -234,7 +234,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String risk
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(java.math.BigDecimal age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(java.lang.Number age, String riskCategory, Boolean isAffordable, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
index ca29b9ce4..17615e7f4 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
@@ -43,7 +43,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(java.math.BigDecimal monthlyIncome, java.math.BigDecimal monthlyRepayments, java.math.BigDecimal monthlyExpenses, String riskCategory, java.math.BigDecimal requiredMonthlyInstallment, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.lang.Number monthlyIncome, java.lang.Number monthlyRepayments, java.lang.Number monthlyExpenses, String riskCategory, java.lang.Number requiredMonthlyInstallment, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'AffordabilityCalculation'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -75,19 +75,19 @@ public Boolean apply(java.math.BigDecimal monthlyIncome, java.math.BigDecimal mo
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                java.math.BigDecimal monthlyIncome = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal monthlyRepayments = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal monthlyExpenses = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number monthlyIncome = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number monthlyRepayments = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number monthlyExpenses = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 String riskCategory = 3 < args_.length ? (String) args_[3] : null;
-                java.math.BigDecimal requiredMonthlyInstallment = 4 < args_.length ? (java.math.BigDecimal) args_[4] : null;
+                java.lang.Number requiredMonthlyInstallment = 4 < args_.length ? (java.lang.Number) args_[4] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 5 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[5] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                java.math.BigDecimal disposableIncome = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments));
-                java.math.BigDecimal creditContingencyFactor = CreditContingencyFactorTable.instance().apply(riskCategory, context_);
+                java.lang.Number disposableIncome = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments));
+                java.lang.Number creditContingencyFactor = CreditContingencyFactorTable.instance().apply(riskCategory, context_);
                 Boolean affordability = (booleanEqual(numericGreaterThan(numericMultiply(disposableIncome, creditContingencyFactor), requiredMonthlyInstallment), Boolean.TRUE)) ? Boolean.TRUE : Boolean.FALSE;
                 return affordability;
             }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
index 0d47a1ed5..fa8b3350f 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
@@ -27,7 +27,7 @@ public ApplicationRiskScore() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("ApplicantData") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("ApplicantData"), new com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TApplicantData applicantData, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'ApplicationRiskScore'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -49,7 +49,7 @@ public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreArguments_);
 
             // Evaluate decision 'ApplicationRiskScore'
-            java.math.BigDecimal output_ = lambda.apply(applicantData, context_);
+            java.lang.Number output_ = lambda.apply(applicantData, context_);
 
             // End decision 'ApplicationRiskScore'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreStartTime_));
@@ -61,9 +61,9 @@ public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TApplicantData applicantData = 0 < args_.length ? (type.TApplicantData) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -71,7 +71,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return ApplicationRiskScoreModel.instance().apply(((java.math.BigDecimal)(applicantData != null ? applicantData.getAge() : null)), ((String)(applicantData != null ? applicantData.getMaritalStatus() : null)), ((String)(applicantData != null ? applicantData.getEmploymentStatus() : null)), context_);
+                return ApplicationRiskScoreModel.instance().apply(((java.lang.Number)(applicantData != null ? applicantData.getAge() : null)), ((String)(applicantData != null ? applicantData.getMaritalStatus() : null)), ((String)(applicantData != null ? applicantData.getEmploymentStatus() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
index 71c3b7362..eb4b9849e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
@@ -34,7 +34,7 @@ private ApplicationRiskScoreModel() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), input_.get("MaritalStatus"), input_.get("EmploymentStatus"), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'ApplicationRiskScoreModel'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -58,7 +58,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_);
 
             // Evaluate BKM 'ApplicationRiskScoreModel'
-            java.math.BigDecimal output_ = lambda.apply(age, maritalStatus, employmentStatus, context_);
+            java.lang.Number output_ = lambda.apply(age, maritalStatus, employmentStatus, context_);
 
             // End BKM 'ApplicationRiskScoreModel'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreModelStartTime_));
@@ -70,10 +70,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String maritalStatus = 1 < args_.length ? (String) args_[1] : null;
                 String employmentStatus = 2 < args_.length ? (String) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
@@ -97,7 +97,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule10(age, maritalStatus, employmentStatus, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = null;
@@ -111,7 +111,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -144,7 +144,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -177,7 +177,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -210,7 +210,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -243,7 +243,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -276,7 +276,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -309,7 +309,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -342,7 +342,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
@@ -375,7 +375,7 @@ public com.gs.dmn.runtime.RuleOutput rule7(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule8(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule8(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(8, "");
 
@@ -408,7 +408,7 @@ public com.gs.dmn.runtime.RuleOutput rule8(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule9(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule9(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(9, "");
 
@@ -441,7 +441,7 @@ public com.gs.dmn.runtime.RuleOutput rule9(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule10(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule10(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(10, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModelRuleOutput.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModelRuleOutput.java
index e8adf1871..6a3e2bbe9 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModelRuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModelRuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "ApplicationRiskScoreModel"})
 public class ApplicationRiskScoreModelRuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal applicationRiskScoreModel;
+    private java.lang.Number applicationRiskScoreModel;
 
     public ApplicationRiskScoreModelRuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("ApplicationRiskScoreModel")
-    public java.math.BigDecimal getApplicationRiskScoreModel() {
+    public java.lang.Number getApplicationRiskScoreModel() {
         return this.applicationRiskScoreModel;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("ApplicationRiskScoreModel")
-    public void setApplicationRiskScoreModel(java.math.BigDecimal applicationRiskScoreModel) {
+    public void setApplicationRiskScoreModel(java.lang.Number applicationRiskScoreModel) {
         this.applicationRiskScoreModel = applicationRiskScoreModel;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
index 39988fd1e..e95815237 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
@@ -34,7 +34,7 @@ private CreditContingencyFactorTable() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(input_.get("RiskCategory"), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(String riskCategory, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'CreditContingencyFactorTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.Execut
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_);
 
             // Evaluate BKM 'CreditContingencyFactorTable'
-            java.math.BigDecimal output_ = lambda.apply(riskCategory, context_);
+            java.lang.Number output_ = lambda.apply(riskCategory, context_);
 
             // End BKM 'CreditContingencyFactorTable'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_, output_, (System.currentTimeMillis() - creditContingencyFactorTableStartTime_));
@@ -68,9 +68,9 @@ public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.Execut
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 String riskCategory = 0 < args_.length ? (String) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -85,7 +85,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule2(riskCategory, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTableRuleOutput.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTableRuleOutput.java
index cf2beb095..43b9e8e1b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTableRuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTableRuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "CreditContingencyFactorTable"})
 public class CreditContingencyFactorTableRuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal creditContingencyFactorTable;
+    private java.lang.Number creditContingencyFactorTable;
 
     public CreditContingencyFactorTableRuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditContingencyFactorTable")
-    public java.math.BigDecimal getCreditContingencyFactorTable() {
+    public java.lang.Number getCreditContingencyFactorTable() {
         return this.creditContingencyFactorTable;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("CreditContingencyFactorTable")
-    public void setCreditContingencyFactorTable(java.math.BigDecimal creditContingencyFactorTable) {
+    public void setCreditContingencyFactorTable(java.lang.Number creditContingencyFactorTable) {
         this.creditContingencyFactorTable = creditContingencyFactorTable;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
index b72ec5a76..176e1a11a 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
@@ -86,7 +86,7 @@ public String apply(Object... args_) {
                 Boolean preBureauAffordability = Eligibility.this.preBureauAffordability.apply(applicantData, requestedProduct, context_);
                 String preBureauRiskCategory = Eligibility.this.preBureauRiskCategory.apply(applicantData, context_);
 
-                return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, ((java.math.BigDecimal)(applicantData != null ? applicantData.getAge() : null)), context_);
+                return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, ((java.lang.Number)(applicantData != null ? applicantData.getAge() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
index c186e78a1..b048cdbb0 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'EligibilityRules'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -75,7 +75,7 @@ public String apply(String preBureauRiskCategory, Boolean preBureauAffordability
             public String apply(Object... args_) {
                 String preBureauRiskCategory = 0 < args_.length ? (String) args_[0] : null;
                 Boolean preBureauAffordability = 1 < args_.length ? (Boolean) args_[1] : null;
-                java.math.BigDecimal age = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number age = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -104,7 +104,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -138,7 +138,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -172,7 +172,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -206,7 +206,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
index cd3e17db3..858b65624 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
@@ -34,7 +34,7 @@ private InstallmentCalculation() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(input_.get("ProductType"), (input_.get("Rate") != null ? number(input_.get("Rate")) : null), (input_.get("Term") != null ? number(input_.get("Term")) : null), (input_.get("Amount") != null ? number(input_.get("Amount")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate, java.math.BigDecimal term, java.math.BigDecimal amount, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(String productType, java.lang.Number rate, java.lang.Number term, java.lang.Number amount, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'InstallmentCalculation'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -59,7 +59,7 @@ public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate,
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_);
 
             // Evaluate BKM 'InstallmentCalculation'
-            java.math.BigDecimal output_ = lambda.apply(productType, rate, term, amount, context_);
+            java.lang.Number output_ = lambda.apply(productType, rate, term, amount, context_);
 
             // End BKM 'InstallmentCalculation'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_, output_, (System.currentTimeMillis() - installmentCalculationStartTime_));
@@ -71,21 +71,21 @@ public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate,
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 String productType = 0 < args_.length ? (String) args_[0] : null;
-                java.math.BigDecimal rate = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal term = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
-                java.math.BigDecimal amount = 3 < args_.length ? (java.math.BigDecimal) args_[3] : null;
+                java.lang.Number rate = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number term = 2 < args_.length ? (java.lang.Number) args_[2] : null;
+                java.lang.Number amount = 3 < args_.length ? (java.lang.Number) args_[3] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 4 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[4] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                java.math.BigDecimal monthlyFee = (booleanEqual(stringEqual(productType, "STANDARD LOAN"), Boolean.TRUE)) ? number("20.00") : (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), Boolean.TRUE)) ? number("25.00") : null;
-                java.math.BigDecimal monthlyRepayment = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term))));
+                java.lang.Number monthlyFee = (booleanEqual(stringEqual(productType, "STANDARD LOAN"), Boolean.TRUE)) ? number("20.00") : (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), Boolean.TRUE)) ? number("25.00") : null;
+                java.lang.Number monthlyRepayment = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term))));
                 return numericAdd(monthlyRepayment, monthlyFee);
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
index 95395d799..04f7c79ab 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
@@ -86,9 +86,9 @@ public Boolean apply(Object... args_) {
 
                 // Apply child decisions
                 String postBureauRiskCategory = PostBureauAffordability.this.postBureauRiskCategory.apply(applicantData, bureauData, context_);
-                java.math.BigDecimal requiredMonthlyInstallment = PostBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
+                java.lang.Number requiredMonthlyInstallment = PostBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
 
-                return AffordabilityCalculation.instance().apply(((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), postBureauRiskCategory, requiredMonthlyInstallment, context_);
+                return AffordabilityCalculation.instance().apply(((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), postBureauRiskCategory, requiredMonthlyInstallment, context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
index 0386ca582..9aa2e6235 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
@@ -81,9 +81,9 @@ public String apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal applicationRiskScore = PostBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
+                java.lang.Number applicationRiskScore = PostBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
 
-                return PostBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, ((java.math.BigDecimal)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
+                return PostBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, ((java.lang.Number)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
index ec2e18c1c..7e474c4ff 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'Post-bureauRiskCategoryTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -74,8 +74,8 @@ public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRi
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
                 Boolean existingCustomer = 0 < args_.length ? (Boolean) args_[0] : null;
-                java.math.BigDecimal applicationRiskScore = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal creditScore = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number applicationRiskScore = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number creditScore = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -113,7 +113,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -146,7 +146,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -179,7 +179,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -212,7 +212,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -245,7 +245,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -278,7 +278,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -311,7 +311,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -344,7 +344,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
@@ -377,7 +377,7 @@ public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(8, "");
 
@@ -410,7 +410,7 @@ public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(9, "");
 
@@ -443,7 +443,7 @@ public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(10, "");
 
@@ -476,7 +476,7 @@ public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.math.
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 11, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(11, "");
 
@@ -509,7 +509,7 @@ public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.math.
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 12, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule12(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule12(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(12, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
index 916abd011..0fa32fceb 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
@@ -84,9 +84,9 @@ public Boolean apply(Object... args_) {
 
                 // Apply child decisions
                 String preBureauRiskCategory = PreBureauAffordability.this.preBureauRiskCategory.apply(applicantData, context_);
-                java.math.BigDecimal requiredMonthlyInstallment = PreBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
+                java.lang.Number requiredMonthlyInstallment = PreBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
 
-                return AffordabilityCalculation.instance().apply(((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), preBureauRiskCategory, requiredMonthlyInstallment, context_);
+                return AffordabilityCalculation.instance().apply(((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), preBureauRiskCategory, requiredMonthlyInstallment, context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
index a1ab90afe..c18b48cd8 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
@@ -79,7 +79,7 @@ public String apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal applicationRiskScore = PreBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
+                java.lang.Number applicationRiskScore = PreBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
 
                 return PreBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, context_);
             }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
index 5ce913feb..8bf4edd5e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'Pre-bureauRiskCategoryTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -73,7 +73,7 @@ public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRi
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
                 Boolean existingCustomer = 0 < args_.length ? (Boolean) args_[0] : null;
-                java.math.BigDecimal applicationRiskScore = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number applicationRiskScore = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -106,7 +106,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -138,7 +138,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -170,7 +170,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -202,7 +202,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -234,7 +234,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -266,7 +266,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -298,7 +298,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -330,7 +330,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
index f3d202996..2536c99e2 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
@@ -27,7 +27,7 @@ public RequiredMonthlyInstallment() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("RequestedProduct") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("RequestedProduct"), new com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TRequestedProduct requestedProduct, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'RequiredMonthlyInstallment'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -49,7 +49,7 @@ public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.g
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, requiredMonthlyInstallmentArguments_);
 
             // Evaluate decision 'RequiredMonthlyInstallment'
-            java.math.BigDecimal output_ = lambda.apply(requestedProduct, context_);
+            java.lang.Number output_ = lambda.apply(requestedProduct, context_);
 
             // End decision 'RequiredMonthlyInstallment'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, requiredMonthlyInstallmentArguments_, output_, (System.currentTimeMillis() - requiredMonthlyInstallmentStartTime_));
@@ -61,9 +61,9 @@ public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.g
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TRequestedProduct requestedProduct = 0 < args_.length ? (type.TRequestedProduct) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -71,7 +71,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return InstallmentCalculation.instance().apply(((String)(requestedProduct != null ? requestedProduct.getProductType() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getRate() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getTerm() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getAmount() : null)), context_);
+                return InstallmentCalculation.instance().apply(((String)(requestedProduct != null ? requestedProduct.getProductType() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getRate() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getTerm() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getAmount() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Routing.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Routing.java
index cfbf2b557..fa22b2cbf 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Routing.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/Routing.java
@@ -88,7 +88,7 @@ public String apply(Object... args_) {
                 Boolean postBureauAffordability = Routing.this.postBureauAffordability.apply(applicantData, bureauData, requestedProduct, context_);
                 String postBureauRiskCategory = Routing.this.postBureauRiskCategory.apply(applicantData, bureauData, context_);
 
-                return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, ((Boolean)(bureauData != null ? bureauData.getBankrupt() : null)), ((java.math.BigDecimal)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
+                return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, ((Boolean)(bureauData != null ? bureauData.getBankrupt() : null)), ((java.lang.Number)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
index 787d9d796..4e7987574 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'RoutingRules'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -77,7 +77,7 @@ public String apply(Object... args_) {
                 String postBureauRiskCategory = 0 < args_.length ? (String) args_[0] : null;
                 Boolean postBureauAffordability = 1 < args_.length ? (Boolean) args_[1] : null;
                 Boolean bankrupt = 2 < args_.length ? (Boolean) args_[2] : null;
-                java.math.BigDecimal creditScore = 3 < args_.length ? (java.math.BigDecimal) args_[3] : null;
+                java.lang.Number creditScore = 3 < args_.length ? (java.lang.Number) args_[3] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 4 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[4] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -107,7 +107,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -142,7 +142,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -177,7 +177,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -212,7 +212,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -247,7 +247,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/Monthly.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/Monthly.java
index 8a70c826d..84da9e176 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/Monthly.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/Monthly.java
@@ -14,17 +14,17 @@ static Monthly toMonthly(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             MonthlyImpl result_ = new MonthlyImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Income")) {
-                result_.setIncome((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Income"));
+                result_.setIncome((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Income"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Expenses")) {
-                result_.setExpenses((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Expenses"));
+                result_.setExpenses((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Expenses"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Repayments")) {
-                result_.setRepayments((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Repayments"));
+                result_.setRepayments((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Repayments"));
             } else {
                 return  null;
             }
@@ -37,13 +37,13 @@ static Monthly toMonthly(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Income")
-    java.math.BigDecimal getIncome();
+    java.lang.Number getIncome();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Expenses")
-    java.math.BigDecimal getExpenses();
+    java.lang.Number getExpenses();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Repayments")
-    java.math.BigDecimal getRepayments();
+    java.lang.Number getRepayments();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/MonthlyImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/MonthlyImpl.java
index 35524f46f..176a0ffb7 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/MonthlyImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/MonthlyImpl.java
@@ -5,46 +5,46 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "Monthly"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class MonthlyImpl implements Monthly {
-        private java.math.BigDecimal income;
-        private java.math.BigDecimal expenses;
-        private java.math.BigDecimal repayments;
+        private java.lang.Number income;
+        private java.lang.Number expenses;
+        private java.lang.Number repayments;
 
     public MonthlyImpl() {
     }
 
-    public MonthlyImpl(java.math.BigDecimal expenses, java.math.BigDecimal income, java.math.BigDecimal repayments) {
+    public MonthlyImpl(java.lang.Number expenses, java.lang.Number income, java.lang.Number repayments) {
         this.setExpenses(expenses);
         this.setIncome(income);
         this.setRepayments(repayments);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Expenses")
-    public java.math.BigDecimal getExpenses() {
+    public java.lang.Number getExpenses() {
         return this.expenses;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Expenses")
-    public void setExpenses(java.math.BigDecimal expenses) {
+    public void setExpenses(java.lang.Number expenses) {
         this.expenses = expenses;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Income")
-    public java.math.BigDecimal getIncome() {
+    public java.lang.Number getIncome() {
         return this.income;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Income")
-    public void setIncome(java.math.BigDecimal income) {
+    public void setIncome(java.lang.Number income) {
         this.income = income;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Repayments")
-    public java.math.BigDecimal getRepayments() {
+    public java.lang.Number getRepayments() {
         return this.repayments;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Repayments")
-    public void setRepayments(java.math.BigDecimal repayments) {
+    public void setRepayments(java.lang.Number repayments) {
         this.repayments = repayments;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantData.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantData.java
index e1cb397ec..8efcce96e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantData.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantData.java
@@ -19,7 +19,7 @@ static TApplicantData toTApplicantData(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Age")) {
-                result_.setAge((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Age"));
+                result_.setAge((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Age"));
             } else {
                 return  null;
             }
@@ -50,7 +50,7 @@ static TApplicantData toTApplicantData(Object other) {
     type.Monthly getMonthly();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Age")
-    java.math.BigDecimal getAge();
+    java.lang.Number getAge();
 
     @com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer")
     Boolean getExistingCustomer();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantDataImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantDataImpl.java
index 77bbe4d98..afe48d54c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantDataImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantDataImpl.java
@@ -6,7 +6,7 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TApplicantDataImpl implements TApplicantData {
         private type.Monthly monthly;
-        private java.math.BigDecimal age;
+        private java.lang.Number age;
         private Boolean existingCustomer;
         private String maritalStatus;
         private String employmentStatus;
@@ -14,7 +14,7 @@ public class TApplicantDataImpl implements TApplicantData {
     public TApplicantDataImpl() {
     }
 
-    public TApplicantDataImpl(java.math.BigDecimal age, String employmentStatus, Boolean existingCustomer, String maritalStatus, type.Monthly monthly) {
+    public TApplicantDataImpl(java.lang.Number age, String employmentStatus, Boolean existingCustomer, String maritalStatus, type.Monthly monthly) {
         this.setAge(age);
         this.setEmploymentStatus(employmentStatus);
         this.setExistingCustomer(existingCustomer);
@@ -23,12 +23,12 @@ public TApplicantDataImpl(java.math.BigDecimal age, String employmentStatus, Boo
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Age")
-    public java.math.BigDecimal getAge() {
+    public java.lang.Number getAge() {
         return this.age;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Age")
-    public void setAge(java.math.BigDecimal age) {
+    public void setAge(java.lang.Number age) {
         this.age = age;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TBureauData.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TBureauData.java
index 4d969e7a9..a9a148816 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TBureauData.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TBureauData.java
@@ -14,7 +14,7 @@ static TBureauData toTBureauData(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TBureauDataImpl result_ = new TBureauDataImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("CreditScore")) {
-                result_.setCreditScore((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("CreditScore"));
+                result_.setCreditScore((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("CreditScore"));
             } else {
                 return  null;
             }
@@ -32,7 +32,7 @@ static TBureauData toTBureauData(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditScore")
-    java.math.BigDecimal getCreditScore();
+    java.lang.Number getCreditScore();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Bankrupt")
     Boolean getBankrupt();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TBureauDataImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TBureauDataImpl.java
index 7438ce35e..5c3f21c86 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TBureauDataImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TBureauDataImpl.java
@@ -5,13 +5,13 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tBureauData"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TBureauDataImpl implements TBureauData {
-        private java.math.BigDecimal creditScore;
+        private java.lang.Number creditScore;
         private Boolean bankrupt;
 
     public TBureauDataImpl() {
     }
 
-    public TBureauDataImpl(Boolean bankrupt, java.math.BigDecimal creditScore) {
+    public TBureauDataImpl(Boolean bankrupt, java.lang.Number creditScore) {
         this.setBankrupt(bankrupt);
         this.setCreditScore(creditScore);
     }
@@ -27,12 +27,12 @@ public void setBankrupt(Boolean bankrupt) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditScore")
-    public java.math.BigDecimal getCreditScore() {
+    public java.lang.Number getCreditScore() {
         return this.creditScore;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("CreditScore")
-    public void setCreditScore(java.math.BigDecimal creditScore) {
+    public void setCreditScore(java.lang.Number creditScore) {
         this.creditScore = creditScore;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProduct.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProduct.java
index 019b791d9..90d490060 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProduct.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProduct.java
@@ -19,17 +19,17 @@ static TRequestedProduct toTRequestedProduct(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Amount")) {
-                result_.setAmount((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Amount"));
+                result_.setAmount((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Amount"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Rate")) {
-                result_.setRate((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Rate"));
+                result_.setRate((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Rate"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Term")) {
-                result_.setTerm((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Term"));
+                result_.setTerm((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Term"));
             } else {
                 return  null;
             }
@@ -45,13 +45,13 @@ static TRequestedProduct toTRequestedProduct(Object other) {
     String getProductType();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Amount")
-    java.math.BigDecimal getAmount();
+    java.lang.Number getAmount();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Rate")
-    java.math.BigDecimal getRate();
+    java.lang.Number getRate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Term")
-    java.math.BigDecimal getTerm();
+    java.lang.Number getTerm();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProductImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProductImpl.java
index 69f7c5d4d..904662ee9 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProductImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProductImpl.java
@@ -6,14 +6,14 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TRequestedProductImpl implements TRequestedProduct {
         private String productType;
-        private java.math.BigDecimal amount;
-        private java.math.BigDecimal rate;
-        private java.math.BigDecimal term;
+        private java.lang.Number amount;
+        private java.lang.Number rate;
+        private java.lang.Number term;
 
     public TRequestedProductImpl() {
     }
 
-    public TRequestedProductImpl(java.math.BigDecimal amount, String productType, java.math.BigDecimal rate, java.math.BigDecimal term) {
+    public TRequestedProductImpl(java.lang.Number amount, String productType, java.lang.Number rate, java.lang.Number term) {
         this.setAmount(amount);
         this.setProductType(productType);
         this.setRate(rate);
@@ -21,12 +21,12 @@ public TRequestedProductImpl(java.math.BigDecimal amount, String productType, ja
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Amount")
-    public java.math.BigDecimal getAmount() {
+    public java.lang.Number getAmount() {
         return this.amount;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Amount")
-    public void setAmount(java.math.BigDecimal amount) {
+    public void setAmount(java.lang.Number amount) {
         this.amount = amount;
     }
 
@@ -41,22 +41,22 @@ public void setProductType(String productType) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Rate")
-    public java.math.BigDecimal getRate() {
+    public java.lang.Number getRate() {
         return this.rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Rate")
-    public void setRate(java.math.BigDecimal rate) {
+    public void setRate(java.lang.Number rate) {
         this.rate = rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Term")
-    public java.math.BigDecimal getTerm() {
+    public java.lang.Number getTerm() {
         return this.term;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Term")
-    public void setTerm(java.math.BigDecimal term) {
+    public void setTerm(java.lang.Number term) {
         this.term = term;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/MonthlyPayment.java b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/MonthlyPayment.java
index 31301dcd0..2df23d0d9 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/MonthlyPayment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/MonthlyPayment.java
@@ -27,7 +27,7 @@ public MonthlyPayment() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Loan") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("Loan"), new com.fasterxml.jackson.core.type.TypeReference<type.TLoanImpl>() {}) : null), (input_.get("fee") != null ? number(input_.get("fee")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TLoan loan, java.math.BigDecimal fee, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TLoan loan, java.lang.Number fee, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'MonthlyPayment'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -50,7 +50,7 @@ public java.math.BigDecimal apply(type.TLoan loan, java.math.BigDecimal fee, com
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_);
 
             // Evaluate decision 'MonthlyPayment'
-            java.math.BigDecimal output_ = lambda.apply(loan, fee, context_);
+            java.lang.Number output_ = lambda.apply(loan, fee, context_);
 
             // End decision 'MonthlyPayment'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_, output_, (System.currentTimeMillis() - monthlyPaymentStartTime_));
@@ -62,18 +62,18 @@ public java.math.BigDecimal apply(type.TLoan loan, java.math.BigDecimal fee, com
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TLoan loan = 0 < args_.length ? (type.TLoan) args_[0] : null;
-                java.math.BigDecimal fee = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number fee = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return numericAdd(PMT.instance().apply(((java.math.BigDecimal)(loan != null ? loan.getAmount() : null)), ((java.math.BigDecimal)(loan != null ? loan.getRate() : null)), ((java.math.BigDecimal)(loan != null ? loan.getTerm() : null)), context_), fee);
+                return numericAdd(PMT.instance().apply(((java.lang.Number)(loan != null ? loan.getAmount() : null)), ((java.lang.Number)(loan != null ? loan.getRate() : null)), ((java.lang.Number)(loan != null ? loan.getTerm() : null)), context_), fee);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/PMT.java b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/PMT.java
index ad0d5dc39..77a0eb03c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/PMT.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/PMT.java
@@ -34,7 +34,7 @@ private PMT() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("p") != null ? number(input_.get("p")) : null), (input_.get("r") != null ? number(input_.get("r")) : null), (input_.get("n") != null ? number(input_.get("n")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r, java.math.BigDecimal n, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number p, java.lang.Number r, java.lang.Number n, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'PMT'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -58,7 +58,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, pMTArguments_);
 
             // Evaluate BKM 'PMT'
-            java.math.BigDecimal output_ = lambda.apply(p, r, n, context_);
+            java.lang.Number output_ = lambda.apply(p, r, n, context_);
 
             // End BKM 'PMT'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, pMTArguments_, output_, (System.currentTimeMillis() - pMTStartTime_));
@@ -70,12 +70,12 @@ public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal p = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal r = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal n = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number p = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number r = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number n = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/type/TLoan.java b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/type/TLoan.java
index a9c90036f..164d785c5 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/type/TLoan.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/type/TLoan.java
@@ -14,17 +14,17 @@ static TLoan toTLoan(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TLoanImpl result_ = new TLoanImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("amount")) {
-                result_.setAmount((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("amount"));
+                result_.setAmount((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("amount"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("rate")) {
-                result_.setRate((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("rate"));
+                result_.setRate((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("rate"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("term")) {
-                result_.setTerm((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("term"));
+                result_.setTerm((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("term"));
             } else {
                 return  null;
             }
@@ -37,13 +37,13 @@ static TLoan toTLoan(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("amount")
-    java.math.BigDecimal getAmount();
+    java.lang.Number getAmount();
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    java.math.BigDecimal getRate();
+    java.lang.Number getRate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("term")
-    java.math.BigDecimal getTerm();
+    java.lang.Number getTerm();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/type/TLoanImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/type/TLoanImpl.java
index 636efed80..bff6f0d60 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/type/TLoanImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0005-literal-invocation/translator/expected/java/dmn/type/TLoanImpl.java
@@ -5,46 +5,46 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tLoan"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TLoanImpl implements TLoan {
-        private java.math.BigDecimal amount;
-        private java.math.BigDecimal rate;
-        private java.math.BigDecimal term;
+        private java.lang.Number amount;
+        private java.lang.Number rate;
+        private java.lang.Number term;
 
     public TLoanImpl() {
     }
 
-    public TLoanImpl(java.math.BigDecimal amount, java.math.BigDecimal rate, java.math.BigDecimal term) {
+    public TLoanImpl(java.lang.Number amount, java.lang.Number rate, java.lang.Number term) {
         this.setAmount(amount);
         this.setRate(rate);
         this.setTerm(term);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("amount")
-    public java.math.BigDecimal getAmount() {
+    public java.lang.Number getAmount() {
         return this.amount;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("amount")
-    public void setAmount(java.math.BigDecimal amount) {
+    public void setAmount(java.lang.Number amount) {
         this.amount = amount;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    public java.math.BigDecimal getRate() {
+    public java.lang.Number getRate() {
         return this.rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("rate")
-    public void setRate(java.math.BigDecimal rate) {
+    public void setRate(java.lang.Number rate) {
         this.rate = rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("term")
-    public java.math.BigDecimal getTerm() {
+    public java.lang.Number getTerm() {
         return this.term;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("term")
-    public void setTerm(java.math.BigDecimal term) {
+    public void setTerm(java.lang.Number term) {
         this.term = term;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/Join.java b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/Join.java
index 4b209b5ca..ef482483a 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/Join.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/Join.java
@@ -75,7 +75,7 @@ public String apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return (String)(elementAt(deptTable.stream().filter(item -> numericEqual(((java.math.BigDecimal)(item != null ? item.getNumber() : null)), (java.math.BigDecimal)(elementAt(employeeTable.stream().filter(item_1_ -> stringEqual(((String)(item_1_ != null ? item_1_.getName() : null)), lastName) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((java.math.BigDecimal)(x != null ? x.getDeptNum() : null))).collect(Collectors.toList()), number("1")))) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)(x != null ? x.getManager() : null))).collect(Collectors.toList()), number("1")));
+                return (String)(elementAt(deptTable.stream().filter(item -> numericEqual(((java.lang.Number)(item != null ? item.getNumber() : null)), (java.lang.Number)(elementAt(employeeTable.stream().filter(item_1_ -> stringEqual(((String)(item_1_ != null ? item_1_.getName() : null)), lastName) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((java.lang.Number)(x != null ? x.getDeptNum() : null))).collect(Collectors.toList()), number("1")))) == Boolean.TRUE).collect(Collectors.toList()).stream().map(x -> ((String)(x != null ? x.getManager() : null))).collect(Collectors.toList()), number("1")));
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TDeptTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TDeptTable.java
index 07ed0926d..516984f38 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TDeptTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TDeptTable.java
@@ -14,7 +14,7 @@ static TDeptTable toTDeptTable(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TDeptTableImpl result_ = new TDeptTableImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("number")) {
-                result_.setNumber((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("number"));
+                result_.setNumber((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("number"));
             } else {
                 return  null;
             }
@@ -37,7 +37,7 @@ static TDeptTable toTDeptTable(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("number")
-    java.math.BigDecimal getNumber();
+    java.lang.Number getNumber();
 
     @com.fasterxml.jackson.annotation.JsonGetter("name")
     String getName();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TDeptTableImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TDeptTableImpl.java
index ea321eb67..5d673fe23 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TDeptTableImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TDeptTableImpl.java
@@ -5,14 +5,14 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tDeptTable"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TDeptTableImpl implements TDeptTable {
-        private java.math.BigDecimal number;
+        private java.lang.Number number;
         private String name;
         private String manager;
 
     public TDeptTableImpl() {
     }
 
-    public TDeptTableImpl(String manager, String name, java.math.BigDecimal number) {
+    public TDeptTableImpl(String manager, String name, java.lang.Number number) {
         this.setManager(manager);
         this.setName(name);
         this.setNumber(number);
@@ -39,12 +39,12 @@ public void setName(String name) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("number")
-    public java.math.BigDecimal getNumber() {
+    public java.lang.Number getNumber() {
         return this.number;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("number")
-    public void setNumber(java.math.BigDecimal number) {
+    public void setNumber(java.lang.Number number) {
         this.number = number;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TEmployeeTable.java b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TEmployeeTable.java
index 1d8bb29e6..5e7a49b09 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TEmployeeTable.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TEmployeeTable.java
@@ -24,7 +24,7 @@ static TEmployeeTable toTEmployeeTable(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("deptNum")) {
-                result_.setDeptNum((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("deptNum"));
+                result_.setDeptNum((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("deptNum"));
             } else {
                 return  null;
             }
@@ -43,7 +43,7 @@ static TEmployeeTable toTEmployeeTable(Object other) {
     String getName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("deptNum")
-    java.math.BigDecimal getDeptNum();
+    java.lang.Number getDeptNum();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TEmployeeTableImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TEmployeeTableImpl.java
index d26686443..13a7d7ce5 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TEmployeeTableImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0006-join/translator/expected/java/dmn/type/TEmployeeTableImpl.java
@@ -7,24 +7,24 @@
 public class TEmployeeTableImpl implements TEmployeeTable {
         private String id;
         private String name;
-        private java.math.BigDecimal deptNum;
+        private java.lang.Number deptNum;
 
     public TEmployeeTableImpl() {
     }
 
-    public TEmployeeTableImpl(java.math.BigDecimal deptNum, String id, String name) {
+    public TEmployeeTableImpl(java.lang.Number deptNum, String id, String name) {
         this.setDeptNum(deptNum);
         this.setId(id);
         this.setName(name);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("deptNum")
-    public java.math.BigDecimal getDeptNum() {
+    public java.lang.Number getDeptNum() {
         return this.deptNum;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("deptNum")
-    public void setDeptNum(java.math.BigDecimal deptNum) {
+    public void setDeptNum(java.lang.Number deptNum) {
         this.deptNum = deptNum;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort1.java b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort1.java
index 4a15efd0a..852c5ec13 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort1.java
@@ -27,16 +27,16 @@ public Sort1() {
     }
 
     @java.lang.Override()
-    public List<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public List<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
-            return apply((input_.get("listA") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("listA"), new com.fasterxml.jackson.core.type.TypeReference<List<java.math.BigDecimal>>() {}) : null), context_);
+            return apply((input_.get("listA") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("listA"), new com.fasterxml.jackson.core.type.TypeReference<List<java.lang.Number>>() {}) : null), context_);
         } catch (Exception e) {
             logError("Cannot apply decision 'Sort1'", e);
             return null;
         }
     }
 
-    public List<java.math.BigDecimal> apply(List<java.math.BigDecimal> listA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public List<java.lang.Number> apply(List<java.lang.Number> listA, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'sort1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -49,7 +49,7 @@ public List<java.math.BigDecimal> apply(List<java.math.BigDecimal> listA, com.gs
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, sort1Arguments_);
 
             // Evaluate decision 'sort1'
-            List<java.math.BigDecimal> output_ = lambda.apply(listA, context_);
+            List<java.lang.Number> output_ = lambda.apply(listA, context_);
 
             // End decision 'sort1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, sort1Arguments_, output_, (System.currentTimeMillis() - sort1StartTime_));
@@ -61,17 +61,17 @@ public List<java.math.BigDecimal> apply(List<java.math.BigDecimal> listA, com.gs
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<List<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<List<java.math.BigDecimal>>() {
-            public List<java.math.BigDecimal> apply(Object... args_) {
-                List<java.math.BigDecimal> listA = 0 < args_.length ? (List<java.math.BigDecimal>) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<List<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<List<java.lang.Number>>() {
+            public List<java.lang.Number> apply(Object... args_) {
+                List<java.lang.Number> listA = 0 < args_.length ? (List<java.lang.Number>) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return sort(listA, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.math.BigDecimal x = (java.math.BigDecimal)args_[0]; java.math.BigDecimal y = (java.math.BigDecimal)args_[1];return numericGreaterThan(x, y);}});
+                return sort(listA, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {java.lang.Number x = (java.lang.Number)args_[0]; java.lang.Number y = (java.lang.Number)args_[1];return numericGreaterThan(x, y);}});
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort2.java b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort2.java
index 97d88b2a8..7db100803 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/Sort2.java
@@ -71,7 +71,7 @@ public List<type.TRow> apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return sort(tableB, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TRow x = (type.TRow)args_[0]; type.TRow y = (type.TRow)args_[1];return numericLessThan(((java.math.BigDecimal)(x != null ? x.getCol2() : null)), ((java.math.BigDecimal)(y != null ? y.getCol2() : null)));}}).stream().map(x -> type.TRow.toTRow(x)).collect(Collectors.toList());
+                return sort(tableB, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TRow x = (type.TRow)args_[0]; type.TRow y = (type.TRow)args_[1];return numericLessThan(((java.lang.Number)(x != null ? x.getCol2() : null)), ((java.lang.Number)(y != null ? y.getCol2() : null)));}}).stream().map(x -> type.TRow.toTRow(x)).collect(Collectors.toList());
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/type/TRow.java b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/type/TRow.java
index da46caf78..fd1141a91 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/type/TRow.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/type/TRow.java
@@ -14,22 +14,22 @@ static TRow toTRow(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TRowImpl result_ = new TRowImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("col1")) {
-                result_.setCol1((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("col1"));
+                result_.setCol1((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("col1"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("col2")) {
-                result_.setCol2((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("col2"));
+                result_.setCol2((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("col2"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("col3")) {
-                result_.setCol3((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("col3"));
+                result_.setCol3((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("col3"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("col4")) {
-                result_.setCol4((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("col4"));
+                result_.setCol4((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("col4"));
             } else {
                 return  null;
             }
@@ -42,16 +42,16 @@ static TRow toTRow(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("col1")
-    java.math.BigDecimal getCol1();
+    java.lang.Number getCol1();
 
     @com.fasterxml.jackson.annotation.JsonGetter("col2")
-    java.math.BigDecimal getCol2();
+    java.lang.Number getCol2();
 
     @com.fasterxml.jackson.annotation.JsonGetter("col3")
-    java.math.BigDecimal getCol3();
+    java.lang.Number getCol3();
 
     @com.fasterxml.jackson.annotation.JsonGetter("col4")
-    java.math.BigDecimal getCol4();
+    java.lang.Number getCol4();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/type/TRowImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/type/TRowImpl.java
index 77c7129a5..ee9204631 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/type/TRowImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0013-sort/translator/expected/java/dmn/type/TRowImpl.java
@@ -5,15 +5,15 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tRow"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TRowImpl implements TRow {
-        private java.math.BigDecimal col1;
-        private java.math.BigDecimal col2;
-        private java.math.BigDecimal col3;
-        private java.math.BigDecimal col4;
+        private java.lang.Number col1;
+        private java.lang.Number col2;
+        private java.lang.Number col3;
+        private java.lang.Number col4;
 
     public TRowImpl() {
     }
 
-    public TRowImpl(java.math.BigDecimal col1, java.math.BigDecimal col2, java.math.BigDecimal col3, java.math.BigDecimal col4) {
+    public TRowImpl(java.lang.Number col1, java.lang.Number col2, java.lang.Number col3, java.lang.Number col4) {
         this.setCol1(col1);
         this.setCol2(col2);
         this.setCol3(col3);
@@ -21,42 +21,42 @@ public TRowImpl(java.math.BigDecimal col1, java.math.BigDecimal col2, java.math.
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("col1")
-    public java.math.BigDecimal getCol1() {
+    public java.lang.Number getCol1() {
         return this.col1;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("col1")
-    public void setCol1(java.math.BigDecimal col1) {
+    public void setCol1(java.lang.Number col1) {
         this.col1 = col1;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("col2")
-    public java.math.BigDecimal getCol2() {
+    public java.lang.Number getCol2() {
         return this.col2;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("col2")
-    public void setCol2(java.math.BigDecimal col2) {
+    public void setCol2(java.lang.Number col2) {
         this.col2 = col2;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("col3")
-    public java.math.BigDecimal getCol3() {
+    public java.lang.Number getCol3() {
         return this.col3;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("col3")
-    public void setCol3(java.math.BigDecimal col3) {
+    public void setCol3(java.lang.Number col3) {
         this.col3 = col3;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("col4")
-    public java.math.BigDecimal getCol4() {
+    public java.lang.Number getCol4() {
         return this.col4;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("col4")
-    public void setCol4(java.math.BigDecimal col4) {
+    public void setCol4(java.lang.Number col4) {
         this.col4 = col4;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Equity36Mo.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Equity36Mo.java
index ec22cd02a..5ea4eafa9 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Equity36Mo.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/Equity36Mo.java
@@ -34,7 +34,7 @@ private Equity36Mo() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("p") != null ? number(input_.get("p")) : null), (input_.get("r") != null ? number(input_.get("r")) : null), (input_.get("n") != null ? number(input_.get("n")) : null), (input_.get("pmt") != null ? number(input_.get("pmt")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r, java.math.BigDecimal n, java.math.BigDecimal pmt, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number p, java.lang.Number r, java.lang.Number n, java.lang.Number pmt, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'equity36Mo'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -59,7 +59,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, equity36MoArguments_);
 
             // Evaluate BKM 'equity36Mo'
-            java.math.BigDecimal output_ = lambda.apply(p, r, n, pmt, context_);
+            java.lang.Number output_ = lambda.apply(p, r, n, pmt, context_);
 
             // End BKM 'equity36Mo'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, equity36MoArguments_, output_, (System.currentTimeMillis() - equity36MoStartTime_));
@@ -71,13 +71,13 @@ public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal p = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal r = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal n = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
-                java.math.BigDecimal pmt = 3 < args_.length ? (java.math.BigDecimal) args_[3] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number p = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number r = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number n = 2 < args_.length ? (java.lang.Number) args_[2] : null;
+                java.lang.Number pmt = 3 < args_.length ? (java.lang.Number) args_[3] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 4 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[4] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/FinancialMetrics.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/FinancialMetrics.java
index 1c938532c..b1769d37d 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/FinancialMetrics.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/FinancialMetrics.java
@@ -43,7 +43,7 @@ public type.TMetric applyMap(java.util.Map<String, String> input_, com.gs.dmn.ru
         }
     }
 
-    public type.TMetric apply(type.TLoanProduct product, java.math.BigDecimal requestedAmt, com.gs.dmn.runtime.ExecutionContext context_) {
+    public type.TMetric apply(type.TLoanProduct product, java.lang.Number requestedAmt, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'FinancialMetrics'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -73,7 +73,7 @@ public type.TMetric apply(type.TLoanProduct product, java.math.BigDecimal reques
         new com.gs.dmn.runtime.LambdaExpression<type.TMetric>() {
             public type.TMetric apply(Object... args_) {
                 type.TLoanProduct product = 0 < args_.length ? (type.TLoanProduct) args_[0] : null;
-                java.math.BigDecimal requestedAmt = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number requestedAmt = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -81,13 +81,13 @@ public type.TMetric apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 String lenderName = ((String)(product != null ? product.getLenderName() : null));
-                java.math.BigDecimal rate = ((java.math.BigDecimal)(product != null ? product.getRate() : null));
-                java.math.BigDecimal points = ((java.math.BigDecimal)(product != null ? product.getPoints() : null));
-                java.math.BigDecimal fee = ((java.math.BigDecimal)(product != null ? product.getFee() : null));
-                java.math.BigDecimal loanAmt = numericAdd(numericMultiply(requestedAmt, numericAdd(number("1"), numericDivide(points, number("100")))), fee);
-                java.math.BigDecimal downPmtAmt = numericMultiply(number("0.2"), loanAmt);
-                java.math.BigDecimal paymentAmt = MonthlyPayment.instance().apply(loanAmt, rate, number("360"), context_);
-                java.math.BigDecimal equity36moPct = numericSubtract(number("1"), numericMultiply(numericDivide(Equity36Mo.instance().apply(loanAmt, rate, number("36"), paymentAmt, context_), requestedAmt), number("0.8")));
+                java.lang.Number rate = ((java.lang.Number)(product != null ? product.getRate() : null));
+                java.lang.Number points = ((java.lang.Number)(product != null ? product.getPoints() : null));
+                java.lang.Number fee = ((java.lang.Number)(product != null ? product.getFee() : null));
+                java.lang.Number loanAmt = numericAdd(numericMultiply(requestedAmt, numericAdd(number("1"), numericDivide(points, number("100")))), fee);
+                java.lang.Number downPmtAmt = numericMultiply(number("0.2"), loanAmt);
+                java.lang.Number paymentAmt = MonthlyPayment.instance().apply(loanAmt, rate, number("360"), context_);
+                java.lang.Number equity36moPct = numericSubtract(number("1"), numericMultiply(numericDivide(Equity36Mo.instance().apply(loanAmt, rate, number("36"), paymentAmt, context_), requestedAmt), number("0.8")));
                 type.TMetricImpl financialMetrics = new type.TMetricImpl();
                 financialMetrics.setLenderName(lenderName);
                 financialMetrics.setRate(rate);
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/MonthlyPayment.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/MonthlyPayment.java
index 5ce236a27..3c7a8ade3 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/MonthlyPayment.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/MonthlyPayment.java
@@ -34,7 +34,7 @@ private MonthlyPayment() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("p") != null ? number(input_.get("p")) : null), (input_.get("r") != null ? number(input_.get("r")) : null), (input_.get("n") != null ? number(input_.get("n")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r, java.math.BigDecimal n, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number p, java.lang.Number r, java.lang.Number n, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'monthlyPayment'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -58,7 +58,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_);
 
             // Evaluate BKM 'monthlyPayment'
-            java.math.BigDecimal output_ = lambda.apply(p, r, n, context_);
+            java.lang.Number output_ = lambda.apply(p, r, n, context_);
 
             // End BKM 'monthlyPayment'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, monthlyPaymentArguments_, output_, (System.currentTimeMillis() - monthlyPaymentStartTime_));
@@ -70,12 +70,12 @@ public java.math.BigDecimal apply(java.math.BigDecimal p, java.math.BigDecimal r
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal p = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal r = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal n = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number p = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number r = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number n = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/RankedProducts.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/RankedProducts.java
index 460e388d0..15ed4f229 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/RankedProducts.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/RankedProducts.java
@@ -43,7 +43,7 @@ public type.TRankedProducts applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public type.TRankedProducts apply(java.math.BigDecimal requestedAmt, com.gs.dmn.runtime.ExecutionContext context_) {
+    public type.TRankedProducts apply(java.lang.Number requestedAmt, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'RankedProducts'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -71,7 +71,7 @@ public type.TRankedProducts apply(java.math.BigDecimal requestedAmt, com.gs.dmn.
     public com.gs.dmn.runtime.LambdaExpression<type.TRankedProducts> lambda =
         new com.gs.dmn.runtime.LambdaExpression<type.TRankedProducts>() {
             public type.TRankedProducts apply(Object... args_) {
-                java.math.BigDecimal requestedAmt = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number requestedAmt = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -82,10 +82,10 @@ public type.TRankedProducts apply(Object... args_) {
                 List<type.TLoanProduct> bankrates = RankedProducts.this.bankrates.apply(context_);
 
                 List<type.TMetric> metricsTable = bankrates.stream().map(i -> FinancialMetrics.instance().apply(i, requestedAmt, context_)).collect(Collectors.toList());
-                List<type.TMetric> rankByRate = sort(metricsTable, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TMetric x = (type.TMetric)args_[0]; type.TMetric y = (type.TMetric)args_[1];return numericLessThan(((java.math.BigDecimal)(x != null ? x.getRate() : null)), ((java.math.BigDecimal)(y != null ? y.getRate() : null)));}});
-                List<type.TMetric> rankByDownPmt = sort(metricsTable, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TMetric x = (type.TMetric)args_[0]; type.TMetric y = (type.TMetric)args_[1];return numericLessThan(((java.math.BigDecimal)(x != null ? x.getDownPmtAmt() : null)), ((java.math.BigDecimal)(y != null ? y.getDownPmtAmt() : null)));}});
-                List<type.TMetric> rankByMonthlyPmt = sort(metricsTable, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TMetric x = (type.TMetric)args_[0]; type.TMetric y = (type.TMetric)args_[1];return numericLessThan(((java.math.BigDecimal)(x != null ? x.getPaymentAmt() : null)), ((java.math.BigDecimal)(y != null ? y.getPaymentAmt() : null)));}});
-                List<type.TMetric> rankByEquityPct = sort(metricsTable, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TMetric x = (type.TMetric)args_[0]; type.TMetric y = (type.TMetric)args_[1];return numericGreaterThan(((java.math.BigDecimal)(x != null ? x.getEquity36moPct() : null)), ((java.math.BigDecimal)(y != null ? y.getEquity36moPct() : null)));}});
+                List<type.TMetric> rankByRate = sort(metricsTable, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TMetric x = (type.TMetric)args_[0]; type.TMetric y = (type.TMetric)args_[1];return numericLessThan(((java.lang.Number)(x != null ? x.getRate() : null)), ((java.lang.Number)(y != null ? y.getRate() : null)));}});
+                List<type.TMetric> rankByDownPmt = sort(metricsTable, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TMetric x = (type.TMetric)args_[0]; type.TMetric y = (type.TMetric)args_[1];return numericLessThan(((java.lang.Number)(x != null ? x.getDownPmtAmt() : null)), ((java.lang.Number)(y != null ? y.getDownPmtAmt() : null)));}});
+                List<type.TMetric> rankByMonthlyPmt = sort(metricsTable, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TMetric x = (type.TMetric)args_[0]; type.TMetric y = (type.TMetric)args_[1];return numericLessThan(((java.lang.Number)(x != null ? x.getPaymentAmt() : null)), ((java.lang.Number)(y != null ? y.getPaymentAmt() : null)));}});
+                List<type.TMetric> rankByEquityPct = sort(metricsTable, new com.gs.dmn.runtime.LambdaExpression<Boolean>() {public Boolean apply(Object... args_) {type.TMetric x = (type.TMetric)args_[0]; type.TMetric y = (type.TMetric)args_[1];return numericGreaterThan(((java.lang.Number)(x != null ? x.getEquity36moPct() : null)), ((java.lang.Number)(y != null ? y.getEquity36moPct() : null)));}});
                 type.TRankedProductsImpl rankedProducts = new type.TRankedProductsImpl();
                 rankedProducts.setMetricsTable(metricsTable);
                 rankedProducts.setRankByRate(rankByRate);
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TLoanProduct.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TLoanProduct.java
index 57584fac8..1a1f7f3f4 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TLoanProduct.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TLoanProduct.java
@@ -19,17 +19,17 @@ static TLoanProduct toTLoanProduct(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("rate")) {
-                result_.setRate((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("rate"));
+                result_.setRate((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("rate"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("points")) {
-                result_.setPoints((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("points"));
+                result_.setPoints((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("points"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("fee")) {
-                result_.setFee((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("fee"));
+                result_.setFee((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("fee"));
             } else {
                 return  null;
             }
@@ -45,13 +45,13 @@ static TLoanProduct toTLoanProduct(Object other) {
     String getLenderName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    java.math.BigDecimal getRate();
+    java.lang.Number getRate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("points")
-    java.math.BigDecimal getPoints();
+    java.lang.Number getPoints();
 
     @com.fasterxml.jackson.annotation.JsonGetter("fee")
-    java.math.BigDecimal getFee();
+    java.lang.Number getFee();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TLoanProductImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TLoanProductImpl.java
index 94a0e73bb..1fef07761 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TLoanProductImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TLoanProductImpl.java
@@ -6,14 +6,14 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TLoanProductImpl implements TLoanProduct {
         private String lenderName;
-        private java.math.BigDecimal rate;
-        private java.math.BigDecimal points;
-        private java.math.BigDecimal fee;
+        private java.lang.Number rate;
+        private java.lang.Number points;
+        private java.lang.Number fee;
 
     public TLoanProductImpl() {
     }
 
-    public TLoanProductImpl(java.math.BigDecimal fee, String lenderName, java.math.BigDecimal points, java.math.BigDecimal rate) {
+    public TLoanProductImpl(java.lang.Number fee, String lenderName, java.lang.Number points, java.lang.Number rate) {
         this.setFee(fee);
         this.setLenderName(lenderName);
         this.setPoints(points);
@@ -21,12 +21,12 @@ public TLoanProductImpl(java.math.BigDecimal fee, String lenderName, java.math.B
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("fee")
-    public java.math.BigDecimal getFee() {
+    public java.lang.Number getFee() {
         return this.fee;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("fee")
-    public void setFee(java.math.BigDecimal fee) {
+    public void setFee(java.lang.Number fee) {
         this.fee = fee;
     }
 
@@ -41,22 +41,22 @@ public void setLenderName(String lenderName) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("points")
-    public java.math.BigDecimal getPoints() {
+    public java.lang.Number getPoints() {
         return this.points;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("points")
-    public void setPoints(java.math.BigDecimal points) {
+    public void setPoints(java.lang.Number points) {
         this.points = points;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    public java.math.BigDecimal getRate() {
+    public java.lang.Number getRate() {
         return this.rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("rate")
-    public void setRate(java.math.BigDecimal rate) {
+    public void setRate(java.lang.Number rate) {
         this.rate = rate;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TMetric.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TMetric.java
index 138141d6e..95cdb733f 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TMetric.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TMetric.java
@@ -19,37 +19,37 @@ static TMetric toTMetric(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("rate")) {
-                result_.setRate((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("rate"));
+                result_.setRate((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("rate"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("points")) {
-                result_.setPoints((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("points"));
+                result_.setPoints((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("points"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("fee")) {
-                result_.setFee((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("fee"));
+                result_.setFee((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("fee"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("loanAmt")) {
-                result_.setLoanAmt((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("loanAmt"));
+                result_.setLoanAmt((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("loanAmt"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("downPmtAmt")) {
-                result_.setDownPmtAmt((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("downPmtAmt"));
+                result_.setDownPmtAmt((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("downPmtAmt"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("paymentAmt")) {
-                result_.setPaymentAmt((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("paymentAmt"));
+                result_.setPaymentAmt((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("paymentAmt"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("equity36moPct")) {
-                result_.setEquity36moPct((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("equity36moPct"));
+                result_.setEquity36moPct((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("equity36moPct"));
             } else {
                 return  null;
             }
@@ -65,25 +65,25 @@ static TMetric toTMetric(Object other) {
     String getLenderName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    java.math.BigDecimal getRate();
+    java.lang.Number getRate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("points")
-    java.math.BigDecimal getPoints();
+    java.lang.Number getPoints();
 
     @com.fasterxml.jackson.annotation.JsonGetter("fee")
-    java.math.BigDecimal getFee();
+    java.lang.Number getFee();
 
     @com.fasterxml.jackson.annotation.JsonGetter("loanAmt")
-    java.math.BigDecimal getLoanAmt();
+    java.lang.Number getLoanAmt();
 
     @com.fasterxml.jackson.annotation.JsonGetter("downPmtAmt")
-    java.math.BigDecimal getDownPmtAmt();
+    java.lang.Number getDownPmtAmt();
 
     @com.fasterxml.jackson.annotation.JsonGetter("paymentAmt")
-    java.math.BigDecimal getPaymentAmt();
+    java.lang.Number getPaymentAmt();
 
     @com.fasterxml.jackson.annotation.JsonGetter("equity36moPct")
-    java.math.BigDecimal getEquity36moPct();
+    java.lang.Number getEquity36moPct();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TMetricImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TMetricImpl.java
index b936ad154..a4559fe82 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TMetricImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0014-loan-comparison/translator/expected/java/dmn/type/TMetricImpl.java
@@ -6,18 +6,18 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TMetricImpl implements TMetric {
         private String lenderName;
-        private java.math.BigDecimal rate;
-        private java.math.BigDecimal points;
-        private java.math.BigDecimal fee;
-        private java.math.BigDecimal loanAmt;
-        private java.math.BigDecimal downPmtAmt;
-        private java.math.BigDecimal paymentAmt;
-        private java.math.BigDecimal equity36moPct;
+        private java.lang.Number rate;
+        private java.lang.Number points;
+        private java.lang.Number fee;
+        private java.lang.Number loanAmt;
+        private java.lang.Number downPmtAmt;
+        private java.lang.Number paymentAmt;
+        private java.lang.Number equity36moPct;
 
     public TMetricImpl() {
     }
 
-    public TMetricImpl(java.math.BigDecimal downPmtAmt, java.math.BigDecimal equity36moPct, java.math.BigDecimal fee, String lenderName, java.math.BigDecimal loanAmt, java.math.BigDecimal paymentAmt, java.math.BigDecimal points, java.math.BigDecimal rate) {
+    public TMetricImpl(java.lang.Number downPmtAmt, java.lang.Number equity36moPct, java.lang.Number fee, String lenderName, java.lang.Number loanAmt, java.lang.Number paymentAmt, java.lang.Number points, java.lang.Number rate) {
         this.setDownPmtAmt(downPmtAmt);
         this.setEquity36moPct(equity36moPct);
         this.setFee(fee);
@@ -29,32 +29,32 @@ public TMetricImpl(java.math.BigDecimal downPmtAmt, java.math.BigDecimal equity3
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("downPmtAmt")
-    public java.math.BigDecimal getDownPmtAmt() {
+    public java.lang.Number getDownPmtAmt() {
         return this.downPmtAmt;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("downPmtAmt")
-    public void setDownPmtAmt(java.math.BigDecimal downPmtAmt) {
+    public void setDownPmtAmt(java.lang.Number downPmtAmt) {
         this.downPmtAmt = downPmtAmt;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("equity36moPct")
-    public java.math.BigDecimal getEquity36moPct() {
+    public java.lang.Number getEquity36moPct() {
         return this.equity36moPct;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("equity36moPct")
-    public void setEquity36moPct(java.math.BigDecimal equity36moPct) {
+    public void setEquity36moPct(java.lang.Number equity36moPct) {
         this.equity36moPct = equity36moPct;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("fee")
-    public java.math.BigDecimal getFee() {
+    public java.lang.Number getFee() {
         return this.fee;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("fee")
-    public void setFee(java.math.BigDecimal fee) {
+    public void setFee(java.lang.Number fee) {
         this.fee = fee;
     }
 
@@ -69,42 +69,42 @@ public void setLenderName(String lenderName) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("loanAmt")
-    public java.math.BigDecimal getLoanAmt() {
+    public java.lang.Number getLoanAmt() {
         return this.loanAmt;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("loanAmt")
-    public void setLoanAmt(java.math.BigDecimal loanAmt) {
+    public void setLoanAmt(java.lang.Number loanAmt) {
         this.loanAmt = loanAmt;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("paymentAmt")
-    public java.math.BigDecimal getPaymentAmt() {
+    public java.lang.Number getPaymentAmt() {
         return this.paymentAmt;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("paymentAmt")
-    public void setPaymentAmt(java.math.BigDecimal paymentAmt) {
+    public void setPaymentAmt(java.lang.Number paymentAmt) {
         this.paymentAmt = paymentAmt;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("points")
-    public java.math.BigDecimal getPoints() {
+    public java.lang.Number getPoints() {
         return this.points;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("points")
-    public void setPoints(java.math.BigDecimal points) {
+    public void setPoints(java.lang.Number points) {
         this.points = points;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("rate")
-    public java.math.BigDecimal getRate() {
+    public java.lang.Number getRate() {
         return this.rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("rate")
-    public void setRate(java.math.BigDecimal rate) {
+    public void setRate(java.lang.Number rate) {
         this.rate = rate;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen1.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen1.java
index 6479accab..db8b46e9e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen1.java
@@ -79,7 +79,7 @@ public Boolean apply(Object... args_) {
                 // Apply child decisions
                 List<type.TItemPrice> priceTable1 = EveryGtTen1.this.priceTable1.apply(context_);
 
-                return booleanAnd((List)priceTable1.stream().map(i -> numericGreaterThan(((java.math.BigDecimal)(i != null ? i.getPrice() : null)), number("10"))).collect(Collectors.toList()));
+                return booleanAnd((List)priceTable1.stream().map(i -> numericGreaterThan(((java.lang.Number)(i != null ? i.getPrice() : null)), number("10"))).collect(Collectors.toList()));
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen2.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen2.java
index 9302f80cb..580394ac0 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen2.java
@@ -71,7 +71,7 @@ public Boolean apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return booleanAnd((List)priceTable2.stream().map(i -> numericGreaterThan(((java.math.BigDecimal)(i != null ? i.getPrice() : null)), number("10"))).collect(Collectors.toList()));
+                return booleanAnd((List)priceTable2.stream().map(i -> numericGreaterThan(((java.lang.Number)(i != null ? i.getPrice() : null)), number("10"))).collect(Collectors.toList()));
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen3.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen3.java
index 926b9c708..801a2d2b7 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen3.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/EveryGtTen3.java
@@ -79,7 +79,7 @@ public Boolean apply(Object... args_) {
                 // Apply child decisions
                 List<type.TItemPrice> priceTable1 = EveryGtTen3.this.priceTable1.apply(context_);
 
-                return booleanAnd((List)priceTable1.stream().map(i -> booleanEqual(GtTen.instance().apply(((java.math.BigDecimal)(i != null ? i.getPrice() : null)), context_), Boolean.TRUE)).collect(Collectors.toList()));
+                return booleanAnd((List)priceTable1.stream().map(i -> booleanEqual(GtTen.instance().apply(((java.lang.Number)(i != null ? i.getPrice() : null)), context_), Boolean.TRUE)).collect(Collectors.toList()));
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/GtTen.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/GtTen.java
index 9751bc5a6..665ec6324 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/GtTen.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/GtTen.java
@@ -43,7 +43,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(java.math.BigDecimal theNumber, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.lang.Number theNumber, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'gtTen'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -71,7 +71,7 @@ public Boolean apply(java.math.BigDecimal theNumber, com.gs.dmn.runtime.Executio
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                java.math.BigDecimal theNumber = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+                java.lang.Number theNumber = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen1.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen1.java
index 442d1c48b..88d486080 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen1.java
@@ -79,7 +79,7 @@ public Boolean apply(Object... args_) {
                 // Apply child decisions
                 List<type.TItemPrice> priceTable1 = SomeGtTen1.this.priceTable1.apply(context_);
 
-                return booleanOr((List)priceTable1.stream().map(i -> numericGreaterThan(((java.math.BigDecimal)(i != null ? i.getPrice() : null)), number("10"))).collect(Collectors.toList()));
+                return booleanOr((List)priceTable1.stream().map(i -> numericGreaterThan(((java.lang.Number)(i != null ? i.getPrice() : null)), number("10"))).collect(Collectors.toList()));
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen2.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen2.java
index 885cb1dab..9d635551f 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/SomeGtTen2.java
@@ -71,7 +71,7 @@ public Boolean apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return booleanOr((List)priceTable2.stream().map(i -> numericGreaterThan(((java.math.BigDecimal)(i != null ? i.getPrice() : null)), number("10"))).collect(Collectors.toList()));
+                return booleanOr((List)priceTable2.stream().map(i -> numericGreaterThan(((java.lang.Number)(i != null ? i.getPrice() : null)), number("10"))).collect(Collectors.toList()));
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/type/TItemPrice.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/type/TItemPrice.java
index eeec674aa..314815ec1 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/type/TItemPrice.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/type/TItemPrice.java
@@ -19,7 +19,7 @@ static TItemPrice toTItemPrice(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("price")) {
-                result_.setPrice((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("price"));
+                result_.setPrice((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("price"));
             } else {
                 return  null;
             }
@@ -35,7 +35,7 @@ static TItemPrice toTItemPrice(Object other) {
     String getItemName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    java.math.BigDecimal getPrice();
+    java.lang.Number getPrice();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/type/TItemPriceImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/type/TItemPriceImpl.java
index e8ccb42e4..e000ee9d7 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/type/TItemPriceImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0016-some-every/translator/expected/java/dmn/type/TItemPriceImpl.java
@@ -6,12 +6,12 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TItemPriceImpl implements TItemPrice {
         private String itemName;
-        private java.math.BigDecimal price;
+        private java.lang.Number price;
 
     public TItemPriceImpl() {
     }
 
-    public TItemPriceImpl(String itemName, java.math.BigDecimal price) {
+    public TItemPriceImpl(String itemName, java.lang.Number price) {
         this.setItemName(itemName);
         this.setPrice(price);
     }
@@ -27,12 +27,12 @@ public void setItemName(String itemName) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    public java.math.BigDecimal getPrice() {
+    public java.lang.Number getPrice() {
         return this.price;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("price")
-    public void setPrice(java.math.BigDecimal price) {
+    public void setPrice(java.lang.Number price) {
         this.price = price;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceGt10.java b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceGt10.java
index 412017eaa..473cc94ff 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceGt10.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceGt10.java
@@ -105,7 +105,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(type.TA structA, com.gs.dmn.runtime.E
         // Apply rule
         PriceGt10RuleOutput output_ = new PriceGt10RuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericGreaterThan(((java.math.BigDecimal)(structA != null ? structA.getPrice() : null)), number("10"))
+            numericGreaterThan(((java.lang.Number)(structA != null ? structA.getPrice() : null)), number("10"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -136,7 +136,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(type.TA structA, com.gs.dmn.runtime.E
         // Apply rule
         PriceGt10RuleOutput output_ = new PriceGt10RuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            numericLessEqualThan(((java.math.BigDecimal)(structA != null ? structA.getPrice() : null)), number("10"))
+            numericLessEqualThan(((java.lang.Number)(structA != null ? structA.getPrice() : null)), number("10"))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceInRange.java b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceInRange.java
index 703cfcb69..32122c60d 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceInRange.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/PriceInRange.java
@@ -36,7 +36,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(java.math.BigDecimal numB, java.math.BigDecimal numC, type.TA structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(java.lang.Number numB, java.lang.Number numC, type.TA structA, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'priceInRange'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -66,8 +66,8 @@ public String apply(java.math.BigDecimal numB, java.math.BigDecimal numC, type.T
     public com.gs.dmn.runtime.LambdaExpression<String> lambda =
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
-                java.math.BigDecimal numB = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal numC = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number numB = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number numC = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 type.TA structA = 2 < args_.length ? (type.TA) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -95,7 +95,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal numB, java.math.BigDecimal numC, type.TA structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number numB, java.lang.Number numC, type.TA structA, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -109,7 +109,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal numB, java.math.
         // Apply rule
         PriceInRangeRuleOutput output_ = new PriceInRangeRuleOutput(false);
         if (ruleMatches(eventListener_, drgRuleMetadata,
-            booleanAnd(numericGreaterEqualThan(((java.math.BigDecimal)(structA != null ? structA.getPrice() : null)), numB), numericLessEqualThan(((java.math.BigDecimal)(structA != null ? structA.getPrice() : null)), numC))
+            booleanAnd(numericGreaterEqualThan(((java.lang.Number)(structA != null ? structA.getPrice() : null)), numB), numericLessEqualThan(((java.lang.Number)(structA != null ? structA.getPrice() : null)), numC))
         )) {
             // Rule match
             eventListener_.matchRule(DRG_ELEMENT_METADATA, drgRuleMetadata);
@@ -127,7 +127,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal numB, java.math.
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal numB, java.math.BigDecimal numC, type.TA structA, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number numB, java.lang.Number numC, type.TA structA, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/type/TA.java b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/type/TA.java
index 2d334f35f..d4c84e8ee 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/type/TA.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/type/TA.java
@@ -19,7 +19,7 @@ static TA toTA(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("price")) {
-                result_.setPrice((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("price"));
+                result_.setPrice((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("price"));
             } else {
                 return  null;
             }
@@ -35,7 +35,7 @@ static TA toTA(Object other) {
     String getName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    java.math.BigDecimal getPrice();
+    java.lang.Number getPrice();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/type/TAImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/type/TAImpl.java
index 89b2e0b68..98ac206ea 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/type/TAImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0017-tableTests/translator/expected/java/dmn/type/TAImpl.java
@@ -6,12 +6,12 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TAImpl implements TA {
         private String name;
-        private java.math.BigDecimal price;
+        private java.lang.Number price;
 
     public TAImpl() {
     }
 
-    public TAImpl(String name, java.math.BigDecimal price) {
+    public TAImpl(String name, java.lang.Number price) {
         this.setName(name);
         this.setPrice(price);
     }
@@ -27,12 +27,12 @@ public void setName(String name) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("price")
-    public java.math.BigDecimal getPrice() {
+    public java.lang.Number getPrice() {
         return this.price;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("price")
-    public void setPrice(java.math.BigDecimal price) {
+    public void setPrice(java.lang.Number price) {
         this.price = price;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/BaseVacationDays.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/BaseVacationDays.java
index da98d1333..732bb4e65 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/BaseVacationDays.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/BaseVacationDays.java
@@ -27,7 +27,7 @@ public BaseVacationDays() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Base Vacation Days'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, baseVacationDaysArguments_);
 
             // Evaluate decision 'Base Vacation Days'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'Base Vacation Days'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, baseVacationDaysArguments_, output_, (System.currentTimeMillis() - baseVacationDaysStartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1.java
index a05e276f0..56f554863 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1.java
@@ -27,7 +27,7 @@ public ExtraDaysCase1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), (input_.get("Years of Service") != null ? number(input_.get("Years of Service")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Extra days case 1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -50,7 +50,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase1Arguments_);
 
             // Evaluate decision 'Extra days case 1'
-            java.math.BigDecimal output_ = lambda.apply(age, yearsOfService, context_);
+            java.lang.Number output_ = lambda.apply(age, yearsOfService, context_);
 
             // End decision 'Extra days case 1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase1Arguments_, output_, (System.currentTimeMillis() - extraDaysCase1StartTime_));
@@ -62,11 +62,11 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal yearsOfService = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number yearsOfService = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -79,7 +79,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule1(age, yearsOfService, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = number("0");
@@ -93,7 +93,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -125,7 +125,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1RuleOutput.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1RuleOutput.java
index cfc189075..7735689dd 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1RuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase1RuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "Extra days case 1"})
 public class ExtraDaysCase1RuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal extraDaysCase1;
+    private java.lang.Number extraDaysCase1;
 
     public ExtraDaysCase1RuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Extra days case 1")
-    public java.math.BigDecimal getExtraDaysCase1() {
+    public java.lang.Number getExtraDaysCase1() {
         return this.extraDaysCase1;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Extra days case 1")
-    public void setExtraDaysCase1(java.math.BigDecimal extraDaysCase1) {
+    public void setExtraDaysCase1(java.lang.Number extraDaysCase1) {
         this.extraDaysCase1 = extraDaysCase1;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2.java
index 087866d79..27cb4547a 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2.java
@@ -27,7 +27,7 @@ public ExtraDaysCase2() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), (input_.get("Years of Service") != null ? number(input_.get("Years of Service")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Extra days case 2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -50,7 +50,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase2Arguments_);
 
             // Evaluate decision 'Extra days case 2'
-            java.math.BigDecimal output_ = lambda.apply(age, yearsOfService, context_);
+            java.lang.Number output_ = lambda.apply(age, yearsOfService, context_);
 
             // End decision 'Extra days case 2'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase2Arguments_, output_, (System.currentTimeMillis() - extraDaysCase2StartTime_));
@@ -62,11 +62,11 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal yearsOfService = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number yearsOfService = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -79,7 +79,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule1(age, yearsOfService, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = number("0");
@@ -93,7 +93,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -125,7 +125,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2RuleOutput.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2RuleOutput.java
index 43c315867..4014b15d8 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2RuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase2RuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "Extra days case 2"})
 public class ExtraDaysCase2RuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal extraDaysCase2;
+    private java.lang.Number extraDaysCase2;
 
     public ExtraDaysCase2RuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Extra days case 2")
-    public java.math.BigDecimal getExtraDaysCase2() {
+    public java.lang.Number getExtraDaysCase2() {
         return this.extraDaysCase2;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Extra days case 2")
-    public void setExtraDaysCase2(java.math.BigDecimal extraDaysCase2) {
+    public void setExtraDaysCase2(java.lang.Number extraDaysCase2) {
         this.extraDaysCase2 = extraDaysCase2;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3.java
index ef52b5b27..7d199601a 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3.java
@@ -27,7 +27,7 @@ public ExtraDaysCase3() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), (input_.get("Years of Service") != null ? number(input_.get("Years of Service")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Extra days case 3'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -50,7 +50,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase3Arguments_);
 
             // Evaluate decision 'Extra days case 3'
-            java.math.BigDecimal output_ = lambda.apply(age, yearsOfService, context_);
+            java.lang.Number output_ = lambda.apply(age, yearsOfService, context_);
 
             // End decision 'Extra days case 3'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase3Arguments_, output_, (System.currentTimeMillis() - extraDaysCase3StartTime_));
@@ -62,11 +62,11 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal yearsOfService = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number yearsOfService = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -79,7 +79,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule1(age, yearsOfService, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = number("0");
@@ -93,7 +93,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -125,7 +125,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3RuleOutput.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3RuleOutput.java
index a6b5f2f75..4c92fcda1 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3RuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/ExtraDaysCase3RuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "Extra days case 3"})
 public class ExtraDaysCase3RuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal extraDaysCase3;
+    private java.lang.Number extraDaysCase3;
 
     public ExtraDaysCase3RuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Extra days case 3")
-    public java.math.BigDecimal getExtraDaysCase3() {
+    public java.lang.Number getExtraDaysCase3() {
         return this.extraDaysCase3;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Extra days case 3")
-    public void setExtraDaysCase3(java.math.BigDecimal extraDaysCase3) {
+    public void setExtraDaysCase3(java.lang.Number extraDaysCase3) {
         this.extraDaysCase3 = extraDaysCase3;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/TotalVacationDays.java b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/TotalVacationDays.java
index 911bbaa57..4968d61a3 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/TotalVacationDays.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0020-vacation-days/translator/expected/java/dmn/TotalVacationDays.java
@@ -40,7 +40,7 @@ public TotalVacationDays(BaseVacationDays baseVacationDays, ExtraDaysCase1 extra
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), (input_.get("Years of Service") != null ? number(input_.get("Years of Service")) : null), context_);
         } catch (Exception e) {
@@ -49,7 +49,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Total Vacation Days'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -63,7 +63,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, totalVacationDaysArguments_);
 
             // Evaluate decision 'Total Vacation Days'
-            java.math.BigDecimal output_ = lambda.apply(age, yearsOfService, context_);
+            java.lang.Number output_ = lambda.apply(age, yearsOfService, context_);
 
             // End decision 'Total Vacation Days'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, totalVacationDaysArguments_, output_, (System.currentTimeMillis() - totalVacationDaysStartTime_));
@@ -75,11 +75,11 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal yearsOfService = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number yearsOfService = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -87,10 +87,10 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal baseVacationDays = TotalVacationDays.this.baseVacationDays.apply(context_);
-                java.math.BigDecimal extraDaysCase1 = TotalVacationDays.this.extraDaysCase1.apply(age, yearsOfService, context_);
-                java.math.BigDecimal extraDaysCase2 = TotalVacationDays.this.extraDaysCase2.apply(age, yearsOfService, context_);
-                java.math.BigDecimal extraDaysCase3 = TotalVacationDays.this.extraDaysCase3.apply(age, yearsOfService, context_);
+                java.lang.Number baseVacationDays = TotalVacationDays.this.baseVacationDays.apply(context_);
+                java.lang.Number extraDaysCase1 = TotalVacationDays.this.extraDaysCase1.apply(age, yearsOfService, context_);
+                java.lang.Number extraDaysCase2 = TotalVacationDays.this.extraDaysCase2.apply(age, yearsOfService, context_);
+                java.lang.Number extraDaysCase3 = TotalVacationDays.this.extraDaysCase3.apply(age, yearsOfService, context_);
 
                 return numericAdd(numericAdd(baseVacationDays, max(extraDaysCase1, extraDaysCase3)), extraDaysCase2);
             }
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/Circumference.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/Circumference.java
index 697399ecd..e9aecd06e 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/Circumference.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/Circumference.java
@@ -34,7 +34,7 @@ private Circumference() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("radius") != null ? number(input_.get("radius")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal radius, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number radius, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'Circumference'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal radius, com.gs.dmn.runtim
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, circumferenceArguments_);
 
             // Evaluate BKM 'Circumference'
-            java.math.BigDecimal output_ = lambda.apply(radius, context_);
+            java.lang.Number output_ = lambda.apply(radius, context_);
 
             // End BKM 'Circumference'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, circumferenceArguments_, output_, (System.currentTimeMillis() - circumferenceStartTime_));
@@ -68,10 +68,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal radius, com.gs.dmn.runtim
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal radius = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number radius = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationComplexParameters.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationComplexParameters.java
index 1b90dd625..fc228a41b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationComplexParameters.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationComplexParameters.java
@@ -43,7 +43,7 @@ public type.TFnInvocationComplexParamsResult applyMap(java.util.Map<String, Stri
         }
     }
 
-    public type.TFnInvocationComplexParamsResult apply(java.math.BigDecimal inputA, java.math.BigDecimal inputB, com.gs.dmn.runtime.ExecutionContext context_) {
+    public type.TFnInvocationComplexParamsResult apply(java.lang.Number inputA, java.lang.Number inputB, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'fn invocation complex parameters'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -72,8 +72,8 @@ public type.TFnInvocationComplexParamsResult apply(java.math.BigDecimal inputA,
     public com.gs.dmn.runtime.LambdaExpression<type.TFnInvocationComplexParamsResult> lambda =
         new com.gs.dmn.runtime.LambdaExpression<type.TFnInvocationComplexParamsResult>() {
             public type.TFnInvocationComplexParamsResult apply(Object... args_) {
-                java.math.BigDecimal inputA = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal inputB = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number inputA = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number inputB = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -83,9 +83,9 @@ public type.TFnInvocationComplexParamsResult apply(Object... args_) {
                 // Apply child decisions
                 type.TFnLibrary fnLibrary = FnInvocationComplexParameters.this.fnLibrary.apply(context_);
 
-                java.math.BigDecimal functionInvocationInParameter = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getMultiplyFn() : null)).apply(((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getSumFn() : null)).apply(inputA, inputA, context_), ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getSumFn() : null)).apply(inputB, inputB, context_), context_);
-                java.math.BigDecimal functionInvocationLiteralExpressionInParameter = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getMultiplyFn() : null)).apply(numericMultiply(inputA, inputA), (booleanEqual(booleanAnd(numericGreaterEqualThan(((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getSubFn() : null)).apply(inputA, inputB, context_), number("0")), numericLessEqualThan(((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getSubFn() : null)).apply(inputA, inputB, context_), number("10"))), Boolean.TRUE)) ? number("5") : number("10"), context_);
-                java.math.BigDecimal circumference = Circumference.instance().apply(numericAdd(inputA, inputB), context_);
+                java.lang.Number functionInvocationInParameter = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getMultiplyFn() : null)).apply(((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getSumFn() : null)).apply(inputA, inputA, context_), ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getSumFn() : null)).apply(inputB, inputB, context_), context_);
+                java.lang.Number functionInvocationLiteralExpressionInParameter = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getMultiplyFn() : null)).apply(numericMultiply(inputA, inputA), (booleanEqual(booleanAnd(numericGreaterEqualThan(((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getSubFn() : null)).apply(inputA, inputB, context_), number("0")), numericLessEqualThan(((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getSubFn() : null)).apply(inputA, inputB, context_), number("10"))), Boolean.TRUE)) ? number("5") : number("10"), context_);
+                java.lang.Number circumference = Circumference.instance().apply(numericAdd(inputA, inputB), context_);
                 type.TFnInvocationComplexParamsResultImpl fnInvocationComplexParameters = new type.TFnInvocationComplexParamsResultImpl();
                 fnInvocationComplexParameters.setFunctionInvocationInParameter(functionInvocationInParameter);
                 fnInvocationComplexParameters.setFunctionInvocationLiteralExpressionInParameter(functionInvocationLiteralExpressionInParameter);
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationNamedParameters.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationNamedParameters.java
index 231186320..c9fceae06 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationNamedParameters.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationNamedParameters.java
@@ -43,7 +43,7 @@ public type.TFnInvocationNamedResult applyMap(java.util.Map<String, String> inpu
         }
     }
 
-    public type.TFnInvocationNamedResult apply(java.math.BigDecimal inputA, java.math.BigDecimal inputB, com.gs.dmn.runtime.ExecutionContext context_) {
+    public type.TFnInvocationNamedResult apply(java.lang.Number inputA, java.lang.Number inputB, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'fn invocation named parameters'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -72,8 +72,8 @@ public type.TFnInvocationNamedResult apply(java.math.BigDecimal inputA, java.mat
     public com.gs.dmn.runtime.LambdaExpression<type.TFnInvocationNamedResult> lambda =
         new com.gs.dmn.runtime.LambdaExpression<type.TFnInvocationNamedResult>() {
             public type.TFnInvocationNamedResult apply(Object... args_) {
-                java.math.BigDecimal inputA = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal inputB = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number inputA = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number inputB = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -83,10 +83,10 @@ public type.TFnInvocationNamedResult apply(Object... args_) {
                 // Apply child decisions
                 type.TFnLibrary fnLibrary = FnInvocationNamedParameters.this.fnLibrary.apply(context_);
 
-                java.math.BigDecimal subResult = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getSubFn() : null)).apply(inputA, inputB, context_);
-                java.math.BigDecimal multiplicationResultNamed = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getMultiplyFn() : null)).apply(inputA, inputB, context_);
-                java.math.BigDecimal subResultMixed = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getSubFn() : null)).apply(inputB, inputA, context_);
-                java.math.BigDecimal divisionResultNamed = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getDivideFn() : null)).apply(inputA, inputB, context_);
+                java.lang.Number subResult = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getSubFn() : null)).apply(inputA, inputB, context_);
+                java.lang.Number multiplicationResultNamed = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getMultiplyFn() : null)).apply(inputA, inputB, context_);
+                java.lang.Number subResultMixed = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getSubFn() : null)).apply(inputB, inputA, context_);
+                java.lang.Number divisionResultNamed = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getDivideFn() : null)).apply(inputA, inputB, context_);
                 type.TFnInvocationNamedResultImpl fnInvocationNamedParameters = new type.TFnInvocationNamedResultImpl();
                 fnInvocationNamedParameters.setSubResult(subResult);
                 fnInvocationNamedParameters.setMultiplicationResultNamed(multiplicationResultNamed);
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationPositionalParameters.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationPositionalParameters.java
index 987622c7c..281b68372 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationPositionalParameters.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnInvocationPositionalParameters.java
@@ -43,7 +43,7 @@ public type.TFnInvocationPositionalResult applyMap(java.util.Map<String, String>
         }
     }
 
-    public type.TFnInvocationPositionalResult apply(java.math.BigDecimal inputA, java.math.BigDecimal inputB, com.gs.dmn.runtime.ExecutionContext context_) {
+    public type.TFnInvocationPositionalResult apply(java.lang.Number inputA, java.lang.Number inputB, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'fn invocation positional parameters'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -72,8 +72,8 @@ public type.TFnInvocationPositionalResult apply(java.math.BigDecimal inputA, jav
     public com.gs.dmn.runtime.LambdaExpression<type.TFnInvocationPositionalResult> lambda =
         new com.gs.dmn.runtime.LambdaExpression<type.TFnInvocationPositionalResult>() {
             public type.TFnInvocationPositionalResult apply(Object... args_) {
-                java.math.BigDecimal inputA = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal inputB = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number inputA = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number inputB = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -83,9 +83,9 @@ public type.TFnInvocationPositionalResult apply(Object... args_) {
                 // Apply child decisions
                 type.TFnLibrary fnLibrary = FnInvocationPositionalParameters.this.fnLibrary.apply(context_);
 
-                java.math.BigDecimal sumResult = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getSumFn() : null)).apply(inputA, inputB, context_);
-                java.math.BigDecimal multiplicationResultPositional = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getMultiplyFn() : null)).apply(inputA, inputB, context_);
-                java.math.BigDecimal divisionResultPositional = ((com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>)(fnLibrary != null ? fnLibrary.getDivideFn() : null)).apply(inputA, inputB, context_);
+                java.lang.Number sumResult = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getSumFn() : null)).apply(inputA, inputB, context_);
+                java.lang.Number multiplicationResultPositional = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getMultiplyFn() : null)).apply(inputA, inputB, context_);
+                java.lang.Number divisionResultPositional = ((com.gs.dmn.runtime.LambdaExpression<java.lang.Number>)(fnLibrary != null ? fnLibrary.getDivideFn() : null)).apply(inputA, inputB, context_);
                 type.TFnInvocationPositionalResultImpl fnInvocationPositionalParameters = new type.TFnInvocationPositionalResultImpl();
                 fnInvocationPositionalParameters.setSumResult(sumResult);
                 fnInvocationPositionalParameters.setMultiplicationResultPositional(multiplicationResultPositional);
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnLibrary.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnLibrary.java
index 64f811882..2c8ab91dc 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnLibrary.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/FnLibrary.java
@@ -69,10 +69,10 @@ public type.TFnLibrary apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> sumFn = new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0]; java.math.BigDecimal b = (java.math.BigDecimal)args_[1];return numericAdd(a, b);}};
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> subFn = new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0]; java.math.BigDecimal b = (java.math.BigDecimal)args_[1];return numericSubtract(a, b);}};
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> multiplyFn = new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0]; java.math.BigDecimal b = (java.math.BigDecimal)args_[1];return numericMultiply(a, b);}};
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> divideFn = new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0]; java.math.BigDecimal b = (java.math.BigDecimal)args_[1];return (booleanEqual(numericEqual(b, number("0")), Boolean.TRUE)) ? null : numericDivide(a, b);}};
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> sumFn = new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0]; java.lang.Number b = (java.lang.Number)args_[1];return numericAdd(a, b);}};
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> subFn = new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0]; java.lang.Number b = (java.lang.Number)args_[1];return numericSubtract(a, b);}};
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> multiplyFn = new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0]; java.lang.Number b = (java.lang.Number)args_[1];return numericMultiply(a, b);}};
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> divideFn = new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0]; java.lang.Number b = (java.lang.Number)args_[1];return (booleanEqual(numericEqual(b, number("0")), Boolean.TRUE)) ? null : numericDivide(a, b);}};
                 type.TFnLibraryImpl fnLibrary = new type.TFnLibraryImpl();
                 fnLibrary.setSumFn(sumFn);
                 fnLibrary.setSubFn(subFn);
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationComplexParamsResult.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationComplexParamsResult.java
index 9127be3ea..42dacf9a3 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationComplexParamsResult.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationComplexParamsResult.java
@@ -14,17 +14,17 @@ static TFnInvocationComplexParamsResult toTFnInvocationComplexParamsResult(Objec
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TFnInvocationComplexParamsResultImpl result_ = new TFnInvocationComplexParamsResultImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("functionInvocationLiteralExpressionInParameter")) {
-                result_.setFunctionInvocationLiteralExpressionInParameter((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("functionInvocationLiteralExpressionInParameter"));
+                result_.setFunctionInvocationLiteralExpressionInParameter((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("functionInvocationLiteralExpressionInParameter"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("functionInvocationInParameter")) {
-                result_.setFunctionInvocationInParameter((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("functionInvocationInParameter"));
+                result_.setFunctionInvocationInParameter((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("functionInvocationInParameter"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("circumference")) {
-                result_.setCircumference((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("circumference"));
+                result_.setCircumference((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("circumference"));
             } else {
                 return  null;
             }
@@ -37,13 +37,13 @@ static TFnInvocationComplexParamsResult toTFnInvocationComplexParamsResult(Objec
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("functionInvocationLiteralExpressionInParameter")
-    java.math.BigDecimal getFunctionInvocationLiteralExpressionInParameter();
+    java.lang.Number getFunctionInvocationLiteralExpressionInParameter();
 
     @com.fasterxml.jackson.annotation.JsonGetter("functionInvocationInParameter")
-    java.math.BigDecimal getFunctionInvocationInParameter();
+    java.lang.Number getFunctionInvocationInParameter();
 
     @com.fasterxml.jackson.annotation.JsonGetter("circumference")
-    java.math.BigDecimal getCircumference();
+    java.lang.Number getCircumference();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationComplexParamsResultImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationComplexParamsResultImpl.java
index 8020989ae..64ea1c57c 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationComplexParamsResultImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationComplexParamsResultImpl.java
@@ -5,46 +5,46 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tFnInvocationComplexParamsResult"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TFnInvocationComplexParamsResultImpl implements TFnInvocationComplexParamsResult {
-        private java.math.BigDecimal functionInvocationLiteralExpressionInParameter;
-        private java.math.BigDecimal functionInvocationInParameter;
-        private java.math.BigDecimal circumference;
+        private java.lang.Number functionInvocationLiteralExpressionInParameter;
+        private java.lang.Number functionInvocationInParameter;
+        private java.lang.Number circumference;
 
     public TFnInvocationComplexParamsResultImpl() {
     }
 
-    public TFnInvocationComplexParamsResultImpl(java.math.BigDecimal circumference, java.math.BigDecimal functionInvocationInParameter, java.math.BigDecimal functionInvocationLiteralExpressionInParameter) {
+    public TFnInvocationComplexParamsResultImpl(java.lang.Number circumference, java.lang.Number functionInvocationInParameter, java.lang.Number functionInvocationLiteralExpressionInParameter) {
         this.setCircumference(circumference);
         this.setFunctionInvocationInParameter(functionInvocationInParameter);
         this.setFunctionInvocationLiteralExpressionInParameter(functionInvocationLiteralExpressionInParameter);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("circumference")
-    public java.math.BigDecimal getCircumference() {
+    public java.lang.Number getCircumference() {
         return this.circumference;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("circumference")
-    public void setCircumference(java.math.BigDecimal circumference) {
+    public void setCircumference(java.lang.Number circumference) {
         this.circumference = circumference;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("functionInvocationInParameter")
-    public java.math.BigDecimal getFunctionInvocationInParameter() {
+    public java.lang.Number getFunctionInvocationInParameter() {
         return this.functionInvocationInParameter;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("functionInvocationInParameter")
-    public void setFunctionInvocationInParameter(java.math.BigDecimal functionInvocationInParameter) {
+    public void setFunctionInvocationInParameter(java.lang.Number functionInvocationInParameter) {
         this.functionInvocationInParameter = functionInvocationInParameter;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("functionInvocationLiteralExpressionInParameter")
-    public java.math.BigDecimal getFunctionInvocationLiteralExpressionInParameter() {
+    public java.lang.Number getFunctionInvocationLiteralExpressionInParameter() {
         return this.functionInvocationLiteralExpressionInParameter;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("functionInvocationLiteralExpressionInParameter")
-    public void setFunctionInvocationLiteralExpressionInParameter(java.math.BigDecimal functionInvocationLiteralExpressionInParameter) {
+    public void setFunctionInvocationLiteralExpressionInParameter(java.lang.Number functionInvocationLiteralExpressionInParameter) {
         this.functionInvocationLiteralExpressionInParameter = functionInvocationLiteralExpressionInParameter;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationNamedResult.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationNamedResult.java
index 035266d0f..3701b54ba 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationNamedResult.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationNamedResult.java
@@ -14,22 +14,22 @@ static TFnInvocationNamedResult toTFnInvocationNamedResult(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TFnInvocationNamedResultImpl result_ = new TFnInvocationNamedResultImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("subResult")) {
-                result_.setSubResult((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("subResult"));
+                result_.setSubResult((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("subResult"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("subResultMixed")) {
-                result_.setSubResultMixed((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("subResultMixed"));
+                result_.setSubResultMixed((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("subResultMixed"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("divisionResultNamed")) {
-                result_.setDivisionResultNamed((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("divisionResultNamed"));
+                result_.setDivisionResultNamed((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("divisionResultNamed"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("multiplicationResultNamed")) {
-                result_.setMultiplicationResultNamed((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("multiplicationResultNamed"));
+                result_.setMultiplicationResultNamed((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("multiplicationResultNamed"));
             } else {
                 return  null;
             }
@@ -42,16 +42,16 @@ static TFnInvocationNamedResult toTFnInvocationNamedResult(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("subResult")
-    java.math.BigDecimal getSubResult();
+    java.lang.Number getSubResult();
 
     @com.fasterxml.jackson.annotation.JsonGetter("subResultMixed")
-    java.math.BigDecimal getSubResultMixed();
+    java.lang.Number getSubResultMixed();
 
     @com.fasterxml.jackson.annotation.JsonGetter("divisionResultNamed")
-    java.math.BigDecimal getDivisionResultNamed();
+    java.lang.Number getDivisionResultNamed();
 
     @com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultNamed")
-    java.math.BigDecimal getMultiplicationResultNamed();
+    java.lang.Number getMultiplicationResultNamed();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationNamedResultImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationNamedResultImpl.java
index e89964f51..d79a3c315 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationNamedResultImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationNamedResultImpl.java
@@ -5,15 +5,15 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tFnInvocationNamedResult"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TFnInvocationNamedResultImpl implements TFnInvocationNamedResult {
-        private java.math.BigDecimal subResult;
-        private java.math.BigDecimal subResultMixed;
-        private java.math.BigDecimal divisionResultNamed;
-        private java.math.BigDecimal multiplicationResultNamed;
+        private java.lang.Number subResult;
+        private java.lang.Number subResultMixed;
+        private java.lang.Number divisionResultNamed;
+        private java.lang.Number multiplicationResultNamed;
 
     public TFnInvocationNamedResultImpl() {
     }
 
-    public TFnInvocationNamedResultImpl(java.math.BigDecimal divisionResultNamed, java.math.BigDecimal multiplicationResultNamed, java.math.BigDecimal subResult, java.math.BigDecimal subResultMixed) {
+    public TFnInvocationNamedResultImpl(java.lang.Number divisionResultNamed, java.lang.Number multiplicationResultNamed, java.lang.Number subResult, java.lang.Number subResultMixed) {
         this.setDivisionResultNamed(divisionResultNamed);
         this.setMultiplicationResultNamed(multiplicationResultNamed);
         this.setSubResult(subResult);
@@ -21,42 +21,42 @@ public TFnInvocationNamedResultImpl(java.math.BigDecimal divisionResultNamed, ja
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("divisionResultNamed")
-    public java.math.BigDecimal getDivisionResultNamed() {
+    public java.lang.Number getDivisionResultNamed() {
         return this.divisionResultNamed;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("divisionResultNamed")
-    public void setDivisionResultNamed(java.math.BigDecimal divisionResultNamed) {
+    public void setDivisionResultNamed(java.lang.Number divisionResultNamed) {
         this.divisionResultNamed = divisionResultNamed;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultNamed")
-    public java.math.BigDecimal getMultiplicationResultNamed() {
+    public java.lang.Number getMultiplicationResultNamed() {
         return this.multiplicationResultNamed;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("multiplicationResultNamed")
-    public void setMultiplicationResultNamed(java.math.BigDecimal multiplicationResultNamed) {
+    public void setMultiplicationResultNamed(java.lang.Number multiplicationResultNamed) {
         this.multiplicationResultNamed = multiplicationResultNamed;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("subResult")
-    public java.math.BigDecimal getSubResult() {
+    public java.lang.Number getSubResult() {
         return this.subResult;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("subResult")
-    public void setSubResult(java.math.BigDecimal subResult) {
+    public void setSubResult(java.lang.Number subResult) {
         this.subResult = subResult;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("subResultMixed")
-    public java.math.BigDecimal getSubResultMixed() {
+    public java.lang.Number getSubResultMixed() {
         return this.subResultMixed;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("subResultMixed")
-    public void setSubResultMixed(java.math.BigDecimal subResultMixed) {
+    public void setSubResultMixed(java.lang.Number subResultMixed) {
         this.subResultMixed = subResultMixed;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationPositionalResult.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationPositionalResult.java
index 788ac1fdb..ebed9bd47 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationPositionalResult.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationPositionalResult.java
@@ -14,17 +14,17 @@ static TFnInvocationPositionalResult toTFnInvocationPositionalResult(Object othe
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TFnInvocationPositionalResultImpl result_ = new TFnInvocationPositionalResultImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("sumResult")) {
-                result_.setSumResult((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("sumResult"));
+                result_.setSumResult((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("sumResult"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("divisionResultPositional")) {
-                result_.setDivisionResultPositional((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("divisionResultPositional"));
+                result_.setDivisionResultPositional((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("divisionResultPositional"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("multiplicationResultPositional")) {
-                result_.setMultiplicationResultPositional((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("multiplicationResultPositional"));
+                result_.setMultiplicationResultPositional((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("multiplicationResultPositional"));
             } else {
                 return  null;
             }
@@ -37,13 +37,13 @@ static TFnInvocationPositionalResult toTFnInvocationPositionalResult(Object othe
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("sumResult")
-    java.math.BigDecimal getSumResult();
+    java.lang.Number getSumResult();
 
     @com.fasterxml.jackson.annotation.JsonGetter("divisionResultPositional")
-    java.math.BigDecimal getDivisionResultPositional();
+    java.lang.Number getDivisionResultPositional();
 
     @com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultPositional")
-    java.math.BigDecimal getMultiplicationResultPositional();
+    java.lang.Number getMultiplicationResultPositional();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationPositionalResultImpl.java b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationPositionalResultImpl.java
index f9d14392b..2ed7fc3b7 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationPositionalResultImpl.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/0031-static-user-defined-functions/translator/expected/java/dmn/type/TFnInvocationPositionalResultImpl.java
@@ -5,46 +5,46 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tFnInvocationPositionalResult"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TFnInvocationPositionalResultImpl implements TFnInvocationPositionalResult {
-        private java.math.BigDecimal sumResult;
-        private java.math.BigDecimal divisionResultPositional;
-        private java.math.BigDecimal multiplicationResultPositional;
+        private java.lang.Number sumResult;
+        private java.lang.Number divisionResultPositional;
+        private java.lang.Number multiplicationResultPositional;
 
     public TFnInvocationPositionalResultImpl() {
     }
 
-    public TFnInvocationPositionalResultImpl(java.math.BigDecimal divisionResultPositional, java.math.BigDecimal multiplicationResultPositional, java.math.BigDecimal sumResult) {
+    public TFnInvocationPositionalResultImpl(java.lang.Number divisionResultPositional, java.lang.Number multiplicationResultPositional, java.lang.Number sumResult) {
         this.setDivisionResultPositional(divisionResultPositional);
         this.setMultiplicationResultPositional(multiplicationResultPositional);
         this.setSumResult(sumResult);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("divisionResultPositional")
-    public java.math.BigDecimal getDivisionResultPositional() {
+    public java.lang.Number getDivisionResultPositional() {
         return this.divisionResultPositional;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("divisionResultPositional")
-    public void setDivisionResultPositional(java.math.BigDecimal divisionResultPositional) {
+    public void setDivisionResultPositional(java.lang.Number divisionResultPositional) {
         this.divisionResultPositional = divisionResultPositional;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("multiplicationResultPositional")
-    public java.math.BigDecimal getMultiplicationResultPositional() {
+    public java.lang.Number getMultiplicationResultPositional() {
         return this.multiplicationResultPositional;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("multiplicationResultPositional")
-    public void setMultiplicationResultPositional(java.math.BigDecimal multiplicationResultPositional) {
+    public void setMultiplicationResultPositional(java.lang.Number multiplicationResultPositional) {
         this.multiplicationResultPositional = multiplicationResultPositional;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("sumResult")
-    public java.math.BigDecimal getSumResult() {
+    public java.lang.Number getSumResult() {
         return this.sumResult;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("sumResult")
-    public void setSumResult(java.math.BigDecimal sumResult) {
+    public void setSumResult(java.lang.Number sumResult) {
         this.sumResult = sumResult;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/FACT.java b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/FACT.java
index 16c27cf4a..98ccf620b 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/FACT.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/FACT.java
@@ -34,7 +34,7 @@ private FACT() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("n") != null ? number(input_.get("n")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal n, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number n, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'FACT'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal n, com.gs.dmn.runtime.Exe
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, fACTArguments_);
 
             // Evaluate BKM 'FACT'
-            java.math.BigDecimal output_ = lambda.apply(n, context_);
+            java.lang.Number output_ = lambda.apply(n, context_);
 
             // End BKM 'FACT'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, fACTArguments_, output_, (System.currentTimeMillis() - fACTStartTime_));
@@ -68,10 +68,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal n, com.gs.dmn.runtime.Exe
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal n = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number n = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/Main.java b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/Main.java
index 7cc0b27a6..2d8853981 100644
--- a/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/Main.java
+++ b/dmn-test-cases/standard/tck/1.1/cl3/9001-recursive-function/translator/expected/java/dmn/Main.java
@@ -27,7 +27,7 @@ public Main() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("n") != null ? number(input_.get("n")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal n, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number n, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'main'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -49,7 +49,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal n, com.gs.dmn.runtime.Exe
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, mainArguments_);
 
             // Evaluate decision 'main'
-            java.math.BigDecimal output_ = lambda.apply(n, context_);
+            java.lang.Number output_ = lambda.apply(n, context_);
 
             // End decision 'main'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, mainArguments_, output_, (System.currentTimeMillis() - mainStartTime_));
@@ -61,10 +61,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal n, com.gs.dmn.runtime.Exe
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal n = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number n = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_001.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_001.java
index 9fe799306..35dbc2124 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_001.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_001.java
@@ -27,7 +27,7 @@ public Incorrect_001() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'incorrect_001'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, incorrect_001Arguments_);
 
             // Evaluate decision 'incorrect_001'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'incorrect_001'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, incorrect_001Arguments_, output_, (System.currentTimeMillis() - incorrect_001StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> mathFoo = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "foo", Arrays.asList("double")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> mathFoo = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "foo", Arrays.asList("double")), externalExecutor_, java.lang.Number.class);
                 return mathFoo.apply(number("123"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_002.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_002.java
index 5ff3883f2..668e912bb 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_002.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_002.java
@@ -27,7 +27,7 @@ public Incorrect_002() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'incorrect_002'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, incorrect_002Arguments_);
 
             // Evaluate decision 'incorrect_002'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'incorrect_002'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, incorrect_002Arguments_, output_, (System.currentTimeMillis() - incorrect_002StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> fooValueOf = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Foo", "valueOf", Arrays.asList("double")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> fooValueOf = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Foo", "valueOf", Arrays.asList("double")), externalExecutor_, java.lang.Number.class);
                 return fooValueOf.apply(number("123"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_003.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_003.java
index f27d819ea..84bf39250 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_003.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Incorrect_003.java
@@ -27,7 +27,7 @@ public Incorrect_003() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'incorrect_003'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, incorrect_003Arguments_);
 
             // Evaluate decision 'incorrect_003'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'incorrect_003'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, incorrect_003Arguments_, output_, (System.currentTimeMillis() - incorrect_003StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> mathMaxString = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("java.lang.String", "java.lang.String")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> mathMaxString = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("java.lang.String", "java.lang.String")), externalExecutor_, java.lang.Number.class);
                 return mathMaxString.apply("123", "456");
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_001.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_001.java
index aa7e22c8a..0318763cb 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_001.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_001.java
@@ -27,7 +27,7 @@ public Literal_001() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'literal_001'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, literal_001Arguments_);
 
             // Evaluate decision 'literal_001'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'literal_001'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, literal_001Arguments_, output_, (System.currentTimeMillis() - literal_001StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> cos = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "cos", Arrays.asList("double")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> cos = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "cos", Arrays.asList("double")), externalExecutor_, java.lang.Number.class);
                 return cos.apply(number("123"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_002.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_002.java
index 7053c1c9e..689c4a6be 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_002.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_002.java
@@ -27,7 +27,7 @@ public Literal_002() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'literal_002'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, literal_002Arguments_);
 
             // Evaluate decision 'literal_002'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'literal_002'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, literal_002Arguments_, output_, (System.currentTimeMillis() - literal_002StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> maxDouble = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("double", "double")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> maxDouble = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("double", "double")), externalExecutor_, java.lang.Number.class);
                 return maxDouble.apply(number("123.45"), number("456.78"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_003.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_003.java
index f1c487455..92e7963f9 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_003.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_003.java
@@ -27,7 +27,7 @@ public Literal_003() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'literal_003'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, literal_003Arguments_);
 
             // Evaluate decision 'literal_003'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'literal_003'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, literal_003Arguments_, output_, (System.currentTimeMillis() - literal_003StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> max = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("double", "double")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> max = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("double", "double")), externalExecutor_, java.lang.Number.class);
                 return max.apply(number("123"), number("456"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_004.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_004.java
index 7af0d4671..007847bf6 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_004.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_004.java
@@ -27,7 +27,7 @@ public Literal_004() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'literal_004'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, literal_004Arguments_);
 
             // Evaluate decision 'literal_004'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'literal_004'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, literal_004Arguments_, output_, (System.currentTimeMillis() - literal_004StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> max = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("int", "int")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> max = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("int", "int")), externalExecutor_, java.lang.Number.class);
                 return max.apply(number("123"), number("456"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_005.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_005.java
index 8edba02a5..fd8209198 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_005.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_005.java
@@ -27,7 +27,7 @@ public Literal_005() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'literal_005'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, literal_005Arguments_);
 
             // Evaluate decision 'literal_005'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'literal_005'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, literal_005Arguments_, output_, (System.currentTimeMillis() - literal_005StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> valueOf = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Short", "valueOf", Arrays.asList("short")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> valueOf = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Short", "valueOf", Arrays.asList("short")), externalExecutor_, java.lang.Number.class);
                 return valueOf.apply(number("123"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_006.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_006.java
index 8b8956d71..f4ae64fdc 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_006.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_006.java
@@ -27,7 +27,7 @@ public Literal_006() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'literal_006'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, literal_006Arguments_);
 
             // Evaluate decision 'literal_006'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'literal_006'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, literal_006Arguments_, output_, (System.currentTimeMillis() - literal_006StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> valueOf = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Byte", "valueOf", Arrays.asList("byte")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> valueOf = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Byte", "valueOf", Arrays.asList("byte")), externalExecutor_, java.lang.Number.class);
                 return valueOf.apply(number("3"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_008.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_008.java
index a8d30f21d..6ee0aec00 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_008.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/Literal_008.java
@@ -27,7 +27,7 @@ public Literal_008() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'literal_008'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, literal_008Arguments_);
 
             // Evaluate decision 'literal_008'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'literal_008'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, literal_008Arguments_, output_, (System.currentTimeMillis() - literal_008StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                com.gs.dmn.runtime.external.JavaExternalFunction<java.math.BigDecimal> max = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("long", "long")), externalExecutor_, java.math.BigDecimal.class);
+                com.gs.dmn.runtime.external.JavaExternalFunction<java.lang.Number> max = new com.gs.dmn.runtime.external.JavaExternalFunction<>(new com.gs.dmn.runtime.external.JavaFunctionInfo("java.lang.Math", "max", Arrays.asList("long", "long")), externalExecutor_, java.lang.Number.class);
                 return max.apply(number("123"), number("456"));
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/type/Applicant.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/type/Applicant.java
index 895110188..92e96bf18 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/type/Applicant.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/type/Applicant.java
@@ -19,7 +19,7 @@ static Applicant toApplicant(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("age")) {
-                result_.setAge((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("age"));
+                result_.setAge((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("age"));
             } else {
                 return  null;
             }
@@ -35,7 +35,7 @@ static Applicant toApplicant(Object other) {
     String getName();
 
     @com.fasterxml.jackson.annotation.JsonGetter("age")
-    java.math.BigDecimal getAge();
+    java.lang.Number getAge();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/type/ApplicantImpl.java b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/type/ApplicantImpl.java
index ecbb0eac1..de1213637 100644
--- a/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/type/ApplicantImpl.java
+++ b/dmn-test-cases/standard/tck/1.2/cl3/0076-feel-external-java/translator/expected/java/dmn/type/ApplicantImpl.java
@@ -6,23 +6,23 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class ApplicantImpl implements Applicant {
         private String name;
-        private java.math.BigDecimal age;
+        private java.lang.Number age;
 
     public ApplicantImpl() {
     }
 
-    public ApplicantImpl(java.math.BigDecimal age, String name) {
+    public ApplicantImpl(java.lang.Number age, String name) {
         this.setAge(age);
         this.setName(name);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("age")
-    public java.math.BigDecimal getAge() {
+    public java.lang.Number getAge() {
         return this.age;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("age")
-    public void setAge(java.math.BigDecimal age) {
+    public void setAge(java.lang.Number age) {
         this.age = age;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
index ca29b9ce4..17615e7f4 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/AffordabilityCalculation.java
@@ -43,7 +43,7 @@ public Boolean applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime
         }
     }
 
-    public Boolean apply(java.math.BigDecimal monthlyIncome, java.math.BigDecimal monthlyRepayments, java.math.BigDecimal monthlyExpenses, String riskCategory, java.math.BigDecimal requiredMonthlyInstallment, com.gs.dmn.runtime.ExecutionContext context_) {
+    public Boolean apply(java.lang.Number monthlyIncome, java.lang.Number monthlyRepayments, java.lang.Number monthlyExpenses, String riskCategory, java.lang.Number requiredMonthlyInstallment, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'AffordabilityCalculation'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -75,19 +75,19 @@ public Boolean apply(java.math.BigDecimal monthlyIncome, java.math.BigDecimal mo
     public com.gs.dmn.runtime.LambdaExpression<Boolean> lambda =
         new com.gs.dmn.runtime.LambdaExpression<Boolean>() {
             public Boolean apply(Object... args_) {
-                java.math.BigDecimal monthlyIncome = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal monthlyRepayments = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal monthlyExpenses = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number monthlyIncome = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number monthlyRepayments = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number monthlyExpenses = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 String riskCategory = 3 < args_.length ? (String) args_[3] : null;
-                java.math.BigDecimal requiredMonthlyInstallment = 4 < args_.length ? (java.math.BigDecimal) args_[4] : null;
+                java.lang.Number requiredMonthlyInstallment = 4 < args_.length ? (java.lang.Number) args_[4] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 5 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[5] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                java.math.BigDecimal disposableIncome = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments));
-                java.math.BigDecimal creditContingencyFactor = CreditContingencyFactorTable.instance().apply(riskCategory, context_);
+                java.lang.Number disposableIncome = numericSubtract(monthlyIncome, numericAdd(monthlyExpenses, monthlyRepayments));
+                java.lang.Number creditContingencyFactor = CreditContingencyFactorTable.instance().apply(riskCategory, context_);
                 Boolean affordability = (booleanEqual(numericGreaterThan(numericMultiply(disposableIncome, creditContingencyFactor), requiredMonthlyInstallment), Boolean.TRUE)) ? Boolean.TRUE : Boolean.FALSE;
                 return affordability;
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
index 9d5c7e0f6..2b7d0c449 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScore.java
@@ -34,7 +34,7 @@ public ApplicationRiskScore() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("ApplicantData") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("ApplicantData"), new com.fasterxml.jackson.core.type.TypeReference<type.TApplicantDataImpl>() {}) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TApplicantData applicantData, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'ApplicationRiskScore'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreArguments_);
 
             // Evaluate decision 'ApplicationRiskScore'
-            java.math.BigDecimal output_ = lambda.apply(applicantData, context_);
+            java.lang.Number output_ = lambda.apply(applicantData, context_);
 
             // End decision 'ApplicationRiskScore'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreStartTime_));
@@ -68,9 +68,9 @@ public java.math.BigDecimal apply(type.TApplicantData applicantData, com.gs.dmn.
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TApplicantData applicantData = 0 < args_.length ? (type.TApplicantData) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -78,7 +78,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return ApplicationRiskScoreModel.instance().apply(((java.math.BigDecimal)(applicantData != null ? applicantData.getAge() : null)), ((String)(applicantData != null ? applicantData.getMaritalStatus() : null)), ((String)(applicantData != null ? applicantData.getEmploymentStatus() : null)), context_);
+                return ApplicationRiskScoreModel.instance().apply(((java.lang.Number)(applicantData != null ? applicantData.getAge() : null)), ((String)(applicantData != null ? applicantData.getMaritalStatus() : null)), ((String)(applicantData != null ? applicantData.getEmploymentStatus() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
index 71c3b7362..eb4b9849e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModel.java
@@ -34,7 +34,7 @@ private ApplicationRiskScoreModel() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), input_.get("MaritalStatus"), input_.get("EmploymentStatus"), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'ApplicationRiskScoreModel'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -58,7 +58,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_);
 
             // Evaluate BKM 'ApplicationRiskScoreModel'
-            java.math.BigDecimal output_ = lambda.apply(age, maritalStatus, employmentStatus, context_);
+            java.lang.Number output_ = lambda.apply(age, maritalStatus, employmentStatus, context_);
 
             // End BKM 'ApplicationRiskScoreModel'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, applicationRiskScoreModelArguments_, output_, (System.currentTimeMillis() - applicationRiskScoreModelStartTime_));
@@ -70,10 +70,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, String maritalStatus
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 String maritalStatus = 1 < args_.length ? (String) args_[1] : null;
                 String employmentStatus = 2 < args_.length ? (String) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
@@ -97,7 +97,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule10(age, maritalStatus, employmentStatus, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = null;
@@ -111,7 +111,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -144,7 +144,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -177,7 +177,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -210,7 +210,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -243,7 +243,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -276,7 +276,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -309,7 +309,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -342,7 +342,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
@@ -375,7 +375,7 @@ public com.gs.dmn.runtime.RuleOutput rule7(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule8(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule8(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(8, "");
 
@@ -408,7 +408,7 @@ public com.gs.dmn.runtime.RuleOutput rule8(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule9(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule9(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(9, "");
 
@@ -441,7 +441,7 @@ public com.gs.dmn.runtime.RuleOutput rule9(java.math.BigDecimal age, String mari
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule10(java.math.BigDecimal age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule10(java.lang.Number age, String maritalStatus, String employmentStatus, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(10, "");
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModelRuleOutput.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModelRuleOutput.java
index e8adf1871..6a3e2bbe9 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModelRuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/ApplicationRiskScoreModelRuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "ApplicationRiskScoreModel"})
 public class ApplicationRiskScoreModelRuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal applicationRiskScoreModel;
+    private java.lang.Number applicationRiskScoreModel;
 
     public ApplicationRiskScoreModelRuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("ApplicationRiskScoreModel")
-    public java.math.BigDecimal getApplicationRiskScoreModel() {
+    public java.lang.Number getApplicationRiskScoreModel() {
         return this.applicationRiskScoreModel;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("ApplicationRiskScoreModel")
-    public void setApplicationRiskScoreModel(java.math.BigDecimal applicationRiskScoreModel) {
+    public void setApplicationRiskScoreModel(java.lang.Number applicationRiskScoreModel) {
         this.applicationRiskScoreModel = applicationRiskScoreModel;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
index 39988fd1e..e95815237 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTable.java
@@ -34,7 +34,7 @@ private CreditContingencyFactorTable() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(input_.get("RiskCategory"), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(String riskCategory, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'CreditContingencyFactorTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.Execut
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_);
 
             // Evaluate BKM 'CreditContingencyFactorTable'
-            java.math.BigDecimal output_ = lambda.apply(riskCategory, context_);
+            java.lang.Number output_ = lambda.apply(riskCategory, context_);
 
             // End BKM 'CreditContingencyFactorTable'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, creditContingencyFactorTableArguments_, output_, (System.currentTimeMillis() - creditContingencyFactorTableStartTime_));
@@ -68,9 +68,9 @@ public java.math.BigDecimal apply(String riskCategory, com.gs.dmn.runtime.Execut
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 String riskCategory = 0 < args_.length ? (String) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -85,7 +85,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule2(riskCategory, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTableRuleOutput.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTableRuleOutput.java
index cf2beb095..43b9e8e1b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTableRuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/CreditContingencyFactorTableRuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "CreditContingencyFactorTable"})
 public class CreditContingencyFactorTableRuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal creditContingencyFactorTable;
+    private java.lang.Number creditContingencyFactorTable;
 
     public CreditContingencyFactorTableRuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditContingencyFactorTable")
-    public java.math.BigDecimal getCreditContingencyFactorTable() {
+    public java.lang.Number getCreditContingencyFactorTable() {
         return this.creditContingencyFactorTable;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("CreditContingencyFactorTable")
-    public void setCreditContingencyFactorTable(java.math.BigDecimal creditContingencyFactorTable) {
+    public void setCreditContingencyFactorTable(java.lang.Number creditContingencyFactorTable) {
         this.creditContingencyFactorTable = creditContingencyFactorTable;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
index 2ec220f2a..8ae14e13e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Eligibility.java
@@ -93,7 +93,7 @@ public String apply(Object... args_) {
                 Boolean preBureauAffordability = Eligibility.this.preBureauAffordability.apply(applicantData, requestedProduct, context_);
                 String preBureauRiskCategory = Eligibility.this.preBureauRiskCategory.apply(applicantData, context_);
 
-                return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, ((java.math.BigDecimal)(applicantData != null ? applicantData.getAge() : null)), context_);
+                return EligibilityRules.instance().apply(preBureauRiskCategory, preBureauAffordability, ((java.lang.Number)(applicantData != null ? applicantData.getAge() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
index c186e78a1..b048cdbb0 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/EligibilityRules.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'EligibilityRules'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -75,7 +75,7 @@ public String apply(String preBureauRiskCategory, Boolean preBureauAffordability
             public String apply(Object... args_) {
                 String preBureauRiskCategory = 0 < args_.length ? (String) args_[0] : null;
                 Boolean preBureauAffordability = 1 < args_.length ? (Boolean) args_[1] : null;
-                java.math.BigDecimal age = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number age = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -104,7 +104,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -138,7 +138,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -172,7 +172,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -206,7 +206,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(String preBureauRiskCategory, Boolean
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(String preBureauRiskCategory, Boolean preBureauAffordability, java.math.BigDecimal age, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(String preBureauRiskCategory, Boolean preBureauAffordability, java.lang.Number age, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
index cd3e17db3..858b65624 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/InstallmentCalculation.java
@@ -34,7 +34,7 @@ private InstallmentCalculation() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(input_.get("ProductType"), (input_.get("Rate") != null ? number(input_.get("Rate")) : null), (input_.get("Term") != null ? number(input_.get("Term")) : null), (input_.get("Amount") != null ? number(input_.get("Amount")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate, java.math.BigDecimal term, java.math.BigDecimal amount, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(String productType, java.lang.Number rate, java.lang.Number term, java.lang.Number amount, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'InstallmentCalculation'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -59,7 +59,7 @@ public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate,
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_);
 
             // Evaluate BKM 'InstallmentCalculation'
-            java.math.BigDecimal output_ = lambda.apply(productType, rate, term, amount, context_);
+            java.lang.Number output_ = lambda.apply(productType, rate, term, amount, context_);
 
             // End BKM 'InstallmentCalculation'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, installmentCalculationArguments_, output_, (System.currentTimeMillis() - installmentCalculationStartTime_));
@@ -71,21 +71,21 @@ public java.math.BigDecimal apply(String productType, java.math.BigDecimal rate,
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 String productType = 0 < args_.length ? (String) args_[0] : null;
-                java.math.BigDecimal rate = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal term = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
-                java.math.BigDecimal amount = 3 < args_.length ? (java.math.BigDecimal) args_[3] : null;
+                java.lang.Number rate = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number term = 2 < args_.length ? (java.lang.Number) args_[2] : null;
+                java.lang.Number amount = 3 < args_.length ? (java.lang.Number) args_[3] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 4 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[4] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                java.math.BigDecimal monthlyFee = (booleanEqual(stringEqual(productType, "STANDARD LOAN"), Boolean.TRUE)) ? number("20.00") : (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), Boolean.TRUE)) ? number("25.00") : null;
-                java.math.BigDecimal monthlyRepayment = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term))));
+                java.lang.Number monthlyFee = (booleanEqual(stringEqual(productType, "STANDARD LOAN"), Boolean.TRUE)) ? number("20.00") : (booleanEqual(stringEqual(productType, "SPECIAL LOAN"), Boolean.TRUE)) ? number("25.00") : null;
+                java.lang.Number monthlyRepayment = numericDivide(numericDivide(numericMultiply(amount, rate), number("12")), numericSubtract(number("1"), numericExponentiation(numericAdd(number("1"), numericDivide(rate, number("12"))), numericUnaryMinus(term))));
                 return numericAdd(monthlyRepayment, monthlyFee);
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
index d48ed6bb3..18ef1649d 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauAffordability.java
@@ -93,9 +93,9 @@ public Boolean apply(Object... args_) {
 
                 // Apply child decisions
                 String postBureauRiskCategory = PostBureauAffordability.this.postBureauRiskCategory.apply(applicantData, bureauData, context_);
-                java.math.BigDecimal requiredMonthlyInstallment = PostBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
+                java.lang.Number requiredMonthlyInstallment = PostBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
 
-                return AffordabilityCalculation.instance().apply(((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), postBureauRiskCategory, requiredMonthlyInstallment, context_);
+                return AffordabilityCalculation.instance().apply(((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), postBureauRiskCategory, requiredMonthlyInstallment, context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
index e1dbfb74b..3bea4a00f 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategory.java
@@ -88,9 +88,9 @@ public String apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal applicationRiskScore = PostBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
+                java.lang.Number applicationRiskScore = PostBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
 
-                return PostBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, ((java.math.BigDecimal)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
+                return PostBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, ((java.lang.Number)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
index ec2e18c1c..7e474c4ff 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PostBureauRiskCategoryTable.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'Post-bureauRiskCategoryTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -74,8 +74,8 @@ public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRi
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
                 Boolean existingCustomer = 0 < args_.length ? (Boolean) args_[0] : null;
-                java.math.BigDecimal applicationRiskScore = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
-                java.math.BigDecimal creditScore = 2 < args_.length ? (java.math.BigDecimal) args_[2] : null;
+                java.lang.Number applicationRiskScore = 1 < args_.length ? (java.lang.Number) args_[1] : null;
+                java.lang.Number creditScore = 2 < args_.length ? (java.lang.Number) args_[2] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 3 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[3] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -113,7 +113,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -146,7 +146,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -179,7 +179,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -212,7 +212,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -245,7 +245,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -278,7 +278,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -311,7 +311,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -344,7 +344,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
@@ -377,7 +377,7 @@ public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 8, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(8, "");
 
@@ -410,7 +410,7 @@ public com.gs.dmn.runtime.RuleOutput rule8(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 9, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(9, "");
 
@@ -443,7 +443,7 @@ public com.gs.dmn.runtime.RuleOutput rule9(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 10, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(10, "");
 
@@ -476,7 +476,7 @@ public com.gs.dmn.runtime.RuleOutput rule10(Boolean existingCustomer, java.math.
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 11, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(11, "");
 
@@ -509,7 +509,7 @@ public com.gs.dmn.runtime.RuleOutput rule11(Boolean existingCustomer, java.math.
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 12, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule12(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule12(Boolean existingCustomer, java.lang.Number applicationRiskScore, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(12, "");
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
index 0818684ff..c22073d70 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauAffordability.java
@@ -91,9 +91,9 @@ public Boolean apply(Object... args_) {
 
                 // Apply child decisions
                 String preBureauRiskCategory = PreBureauAffordability.this.preBureauRiskCategory.apply(applicantData, context_);
-                java.math.BigDecimal requiredMonthlyInstallment = PreBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
+                java.lang.Number requiredMonthlyInstallment = PreBureauAffordability.this.requiredMonthlyInstallment.apply(requestedProduct, context_);
 
-                return AffordabilityCalculation.instance().apply(((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.math.BigDecimal)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), preBureauRiskCategory, requiredMonthlyInstallment, context_);
+                return AffordabilityCalculation.instance().apply(((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getIncome() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getRepayments() : null)), ((java.lang.Number)(((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)) != null ? ((type.Monthly)(applicantData != null ? applicantData.getMonthly() : null)).getExpenses() : null)), preBureauRiskCategory, requiredMonthlyInstallment, context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
index e6c2993cc..3f9a4d98b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategory.java
@@ -86,7 +86,7 @@ public String apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal applicationRiskScore = PreBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
+                java.lang.Number applicationRiskScore = PreBureauRiskCategory.this.applicationRiskScore.apply(applicantData, context_);
 
                 return PreBureauRiskCategoryTable.instance().apply(((Boolean)(applicantData != null ? applicantData.getExistingCustomer() : null)), applicationRiskScore, context_);
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
index 5ce913feb..8bf4edd5e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/PreBureauRiskCategoryTable.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'Pre-bureauRiskCategoryTable'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -73,7 +73,7 @@ public String apply(Boolean existingCustomer, java.math.BigDecimal applicationRi
         new com.gs.dmn.runtime.LambdaExpression<String>() {
             public String apply(Object... args_) {
                 Boolean existingCustomer = 0 < args_.length ? (Boolean) args_[0] : null;
-                java.math.BigDecimal applicationRiskScore = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+                java.lang.Number applicationRiskScore = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -106,7 +106,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -138,7 +138,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -170,7 +170,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -202,7 +202,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -234,7 +234,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
@@ -266,7 +266,7 @@ public com.gs.dmn.runtime.RuleOutput rule4(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 5, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(5, "");
 
@@ -298,7 +298,7 @@ public com.gs.dmn.runtime.RuleOutput rule5(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 6, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(6, "");
 
@@ -330,7 +330,7 @@ public com.gs.dmn.runtime.RuleOutput rule6(Boolean existingCustomer, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 7, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.math.BigDecimal applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule7(Boolean existingCustomer, java.lang.Number applicationRiskScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(7, "");
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
index ce965ef7f..e3a6f8c08 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RequiredMonthlyInstallment.java
@@ -34,7 +34,7 @@ public RequiredMonthlyInstallment() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("RequestedProduct") != null ? com.gs.dmn.serialization.JsonSerializer.OBJECT_MAPPER.readValue(input_.get("RequestedProduct"), new com.fasterxml.jackson.core.type.TypeReference<type.TRequestedProductImpl>() {}) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(type.TRequestedProduct requestedProduct, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'RequiredMonthlyInstallment'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.g
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, requiredMonthlyInstallmentArguments_);
 
             // Evaluate decision 'RequiredMonthlyInstallment'
-            java.math.BigDecimal output_ = lambda.apply(requestedProduct, context_);
+            java.lang.Number output_ = lambda.apply(requestedProduct, context_);
 
             // End decision 'RequiredMonthlyInstallment'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, requiredMonthlyInstallmentArguments_, output_, (System.currentTimeMillis() - requiredMonthlyInstallmentStartTime_));
@@ -68,9 +68,9 @@ public java.math.BigDecimal apply(type.TRequestedProduct requestedProduct, com.g
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 type.TRequestedProduct requestedProduct = 0 < args_.length ? (type.TRequestedProduct) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -78,7 +78,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return InstallmentCalculation.instance().apply(((String)(requestedProduct != null ? requestedProduct.getProductType() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getRate() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getTerm() : null)), ((java.math.BigDecimal)(requestedProduct != null ? requestedProduct.getAmount() : null)), context_);
+                return InstallmentCalculation.instance().apply(((String)(requestedProduct != null ? requestedProduct.getProductType() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getRate() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getTerm() : null)), ((java.lang.Number)(requestedProduct != null ? requestedProduct.getAmount() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Routing.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Routing.java
index f2a05db9b..9264f1c09 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Routing.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/Routing.java
@@ -95,7 +95,7 @@ public String apply(Object... args_) {
                 Boolean postBureauAffordability = Routing.this.postBureauAffordability.apply(applicantData, bureauData, requestedProduct, context_);
                 String postBureauRiskCategory = Routing.this.postBureauRiskCategory.apply(applicantData, bureauData, context_);
 
-                return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, ((Boolean)(bureauData != null ? bureauData.getBankrupt() : null)), ((java.math.BigDecimal)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
+                return RoutingRules.instance().apply(postBureauRiskCategory, postBureauAffordability, ((Boolean)(bureauData != null ? bureauData.getBankrupt() : null)), ((java.lang.Number)(bureauData != null ? bureauData.getCreditScore() : null)), context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
index 787d9d796..4e7987574 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/RoutingRules.java
@@ -43,7 +43,7 @@ public String applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.
         }
     }
 
-    public String apply(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public String apply(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'RoutingRules'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -77,7 +77,7 @@ public String apply(Object... args_) {
                 String postBureauRiskCategory = 0 < args_.length ? (String) args_[0] : null;
                 Boolean postBureauAffordability = 1 < args_.length ? (Boolean) args_[1] : null;
                 Boolean bankrupt = 2 < args_.length ? (Boolean) args_[2] : null;
-                java.math.BigDecimal creditScore = 3 < args_.length ? (java.math.BigDecimal) args_[3] : null;
+                java.lang.Number creditScore = 3 < args_.length ? (java.lang.Number) args_[3] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 4 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[4] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -107,7 +107,7 @@ public String apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -142,7 +142,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
@@ -177,7 +177,7 @@ public com.gs.dmn.runtime.RuleOutput rule1(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 2, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(2, "");
 
@@ -212,7 +212,7 @@ public com.gs.dmn.runtime.RuleOutput rule2(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 3, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(3, "");
 
@@ -247,7 +247,7 @@ public com.gs.dmn.runtime.RuleOutput rule3(String postBureauRiskCategory, Boolea
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 4, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule4(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.math.BigDecimal creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule4(String postBureauRiskCategory, Boolean postBureauAffordability, Boolean bankrupt, java.lang.Number creditScore, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(4, "");
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/Monthly.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/Monthly.java
index 8a70c826d..84da9e176 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/Monthly.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/Monthly.java
@@ -14,17 +14,17 @@ static Monthly toMonthly(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             MonthlyImpl result_ = new MonthlyImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Income")) {
-                result_.setIncome((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Income"));
+                result_.setIncome((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Income"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Expenses")) {
-                result_.setExpenses((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Expenses"));
+                result_.setExpenses((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Expenses"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Repayments")) {
-                result_.setRepayments((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Repayments"));
+                result_.setRepayments((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Repayments"));
             } else {
                 return  null;
             }
@@ -37,13 +37,13 @@ static Monthly toMonthly(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Income")
-    java.math.BigDecimal getIncome();
+    java.lang.Number getIncome();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Expenses")
-    java.math.BigDecimal getExpenses();
+    java.lang.Number getExpenses();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Repayments")
-    java.math.BigDecimal getRepayments();
+    java.lang.Number getRepayments();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/MonthlyImpl.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/MonthlyImpl.java
index 35524f46f..176a0ffb7 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/MonthlyImpl.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/MonthlyImpl.java
@@ -5,46 +5,46 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "Monthly"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class MonthlyImpl implements Monthly {
-        private java.math.BigDecimal income;
-        private java.math.BigDecimal expenses;
-        private java.math.BigDecimal repayments;
+        private java.lang.Number income;
+        private java.lang.Number expenses;
+        private java.lang.Number repayments;
 
     public MonthlyImpl() {
     }
 
-    public MonthlyImpl(java.math.BigDecimal expenses, java.math.BigDecimal income, java.math.BigDecimal repayments) {
+    public MonthlyImpl(java.lang.Number expenses, java.lang.Number income, java.lang.Number repayments) {
         this.setExpenses(expenses);
         this.setIncome(income);
         this.setRepayments(repayments);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Expenses")
-    public java.math.BigDecimal getExpenses() {
+    public java.lang.Number getExpenses() {
         return this.expenses;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Expenses")
-    public void setExpenses(java.math.BigDecimal expenses) {
+    public void setExpenses(java.lang.Number expenses) {
         this.expenses = expenses;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Income")
-    public java.math.BigDecimal getIncome() {
+    public java.lang.Number getIncome() {
         return this.income;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Income")
-    public void setIncome(java.math.BigDecimal income) {
+    public void setIncome(java.lang.Number income) {
         this.income = income;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Repayments")
-    public java.math.BigDecimal getRepayments() {
+    public java.lang.Number getRepayments() {
         return this.repayments;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Repayments")
-    public void setRepayments(java.math.BigDecimal repayments) {
+    public void setRepayments(java.lang.Number repayments) {
         this.repayments = repayments;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantData.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantData.java
index e1cb397ec..8efcce96e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantData.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantData.java
@@ -19,7 +19,7 @@ static TApplicantData toTApplicantData(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Age")) {
-                result_.setAge((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Age"));
+                result_.setAge((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Age"));
             } else {
                 return  null;
             }
@@ -50,7 +50,7 @@ static TApplicantData toTApplicantData(Object other) {
     type.Monthly getMonthly();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Age")
-    java.math.BigDecimal getAge();
+    java.lang.Number getAge();
 
     @com.fasterxml.jackson.annotation.JsonGetter("ExistingCustomer")
     Boolean getExistingCustomer();
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantDataImpl.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantDataImpl.java
index 77bbe4d98..afe48d54c 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantDataImpl.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TApplicantDataImpl.java
@@ -6,7 +6,7 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TApplicantDataImpl implements TApplicantData {
         private type.Monthly monthly;
-        private java.math.BigDecimal age;
+        private java.lang.Number age;
         private Boolean existingCustomer;
         private String maritalStatus;
         private String employmentStatus;
@@ -14,7 +14,7 @@ public class TApplicantDataImpl implements TApplicantData {
     public TApplicantDataImpl() {
     }
 
-    public TApplicantDataImpl(java.math.BigDecimal age, String employmentStatus, Boolean existingCustomer, String maritalStatus, type.Monthly monthly) {
+    public TApplicantDataImpl(java.lang.Number age, String employmentStatus, Boolean existingCustomer, String maritalStatus, type.Monthly monthly) {
         this.setAge(age);
         this.setEmploymentStatus(employmentStatus);
         this.setExistingCustomer(existingCustomer);
@@ -23,12 +23,12 @@ public TApplicantDataImpl(java.math.BigDecimal age, String employmentStatus, Boo
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Age")
-    public java.math.BigDecimal getAge() {
+    public java.lang.Number getAge() {
         return this.age;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Age")
-    public void setAge(java.math.BigDecimal age) {
+    public void setAge(java.lang.Number age) {
         this.age = age;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TBureauData.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TBureauData.java
index 4d969e7a9..a9a148816 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TBureauData.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TBureauData.java
@@ -14,7 +14,7 @@ static TBureauData toTBureauData(Object other) {
         } else if (other instanceof com.gs.dmn.runtime.Context) {
             TBureauDataImpl result_ = new TBureauDataImpl();
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("CreditScore")) {
-                result_.setCreditScore((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("CreditScore"));
+                result_.setCreditScore((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("CreditScore"));
             } else {
                 return  null;
             }
@@ -32,7 +32,7 @@ static TBureauData toTBureauData(Object other) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditScore")
-    java.math.BigDecimal getCreditScore();
+    java.lang.Number getCreditScore();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Bankrupt")
     Boolean getBankrupt();
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TBureauDataImpl.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TBureauDataImpl.java
index 7438ce35e..5c3f21c86 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TBureauDataImpl.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TBureauDataImpl.java
@@ -5,13 +5,13 @@
 @javax.annotation.Generated(value = {"itemDefinition.ftl", "tBureauData"})
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TBureauDataImpl implements TBureauData {
-        private java.math.BigDecimal creditScore;
+        private java.lang.Number creditScore;
         private Boolean bankrupt;
 
     public TBureauDataImpl() {
     }
 
-    public TBureauDataImpl(Boolean bankrupt, java.math.BigDecimal creditScore) {
+    public TBureauDataImpl(Boolean bankrupt, java.lang.Number creditScore) {
         this.setBankrupt(bankrupt);
         this.setCreditScore(creditScore);
     }
@@ -27,12 +27,12 @@ public void setBankrupt(Boolean bankrupt) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("CreditScore")
-    public java.math.BigDecimal getCreditScore() {
+    public java.lang.Number getCreditScore() {
         return this.creditScore;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("CreditScore")
-    public void setCreditScore(java.math.BigDecimal creditScore) {
+    public void setCreditScore(java.lang.Number creditScore) {
         this.creditScore = creditScore;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProduct.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProduct.java
index 019b791d9..90d490060 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProduct.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProduct.java
@@ -19,17 +19,17 @@ static TRequestedProduct toTRequestedProduct(Object other) {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Amount")) {
-                result_.setAmount((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Amount"));
+                result_.setAmount((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Amount"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Rate")) {
-                result_.setRate((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Rate"));
+                result_.setRate((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Rate"));
             } else {
                 return  null;
             }
             if (((com.gs.dmn.runtime.Context)other).keySet().contains("Term")) {
-                result_.setTerm((java.math.BigDecimal)((com.gs.dmn.runtime.Context)other).get("Term"));
+                result_.setTerm((java.lang.Number)((com.gs.dmn.runtime.Context)other).get("Term"));
             } else {
                 return  null;
             }
@@ -45,13 +45,13 @@ static TRequestedProduct toTRequestedProduct(Object other) {
     String getProductType();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Amount")
-    java.math.BigDecimal getAmount();
+    java.lang.Number getAmount();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Rate")
-    java.math.BigDecimal getRate();
+    java.lang.Number getRate();
 
     @com.fasterxml.jackson.annotation.JsonGetter("Term")
-    java.math.BigDecimal getTerm();
+    java.lang.Number getTerm();
 
     default com.gs.dmn.runtime.Context toContext() {
         com.gs.dmn.runtime.Context context = new com.gs.dmn.runtime.Context();
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProductImpl.java b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProductImpl.java
index 69f7c5d4d..904662ee9 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProductImpl.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0004-lending/translator/expected/java/dmn/type/TRequestedProductImpl.java
@@ -6,14 +6,14 @@
 @com.fasterxml.jackson.annotation.JsonPropertyOrder(alphabetic = true)
 public class TRequestedProductImpl implements TRequestedProduct {
         private String productType;
-        private java.math.BigDecimal amount;
-        private java.math.BigDecimal rate;
-        private java.math.BigDecimal term;
+        private java.lang.Number amount;
+        private java.lang.Number rate;
+        private java.lang.Number term;
 
     public TRequestedProductImpl() {
     }
 
-    public TRequestedProductImpl(java.math.BigDecimal amount, String productType, java.math.BigDecimal rate, java.math.BigDecimal term) {
+    public TRequestedProductImpl(java.lang.Number amount, String productType, java.lang.Number rate, java.lang.Number term) {
         this.setAmount(amount);
         this.setProductType(productType);
         this.setRate(rate);
@@ -21,12 +21,12 @@ public TRequestedProductImpl(java.math.BigDecimal amount, String productType, ja
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Amount")
-    public java.math.BigDecimal getAmount() {
+    public java.lang.Number getAmount() {
         return this.amount;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Amount")
-    public void setAmount(java.math.BigDecimal amount) {
+    public void setAmount(java.lang.Number amount) {
         this.amount = amount;
     }
 
@@ -41,22 +41,22 @@ public void setProductType(String productType) {
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Rate")
-    public java.math.BigDecimal getRate() {
+    public java.lang.Number getRate() {
         return this.rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Rate")
-    public void setRate(java.math.BigDecimal rate) {
+    public void setRate(java.lang.Number rate) {
         this.rate = rate;
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Term")
-    public java.math.BigDecimal getTerm() {
+    public java.lang.Number getTerm() {
         return this.term;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Term")
-    public void setTerm(java.math.BigDecimal term) {
+    public void setTerm(java.lang.Number term) {
         this.term = term;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/BaseVacationDays.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/BaseVacationDays.java
index da98d1333..732bb4e65 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/BaseVacationDays.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/BaseVacationDays.java
@@ -27,7 +27,7 @@ public BaseVacationDays() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Base Vacation Days'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, baseVacationDaysArguments_);
 
             // Evaluate decision 'Base Vacation Days'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'Base Vacation Days'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, baseVacationDaysArguments_, output_, (System.currentTimeMillis() - baseVacationDaysStartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1.java
index a05e276f0..56f554863 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1.java
@@ -27,7 +27,7 @@ public ExtraDaysCase1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), (input_.get("Years of Service") != null ? number(input_.get("Years of Service")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Extra days case 1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -50,7 +50,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase1Arguments_);
 
             // Evaluate decision 'Extra days case 1'
-            java.math.BigDecimal output_ = lambda.apply(age, yearsOfService, context_);
+            java.lang.Number output_ = lambda.apply(age, yearsOfService, context_);
 
             // End decision 'Extra days case 1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase1Arguments_, output_, (System.currentTimeMillis() - extraDaysCase1StartTime_));
@@ -62,11 +62,11 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal yearsOfService = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number yearsOfService = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -79,7 +79,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule1(age, yearsOfService, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = number("0");
@@ -93,7 +93,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -125,7 +125,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1RuleOutput.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1RuleOutput.java
index cfc189075..7735689dd 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1RuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase1RuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "Extra days case 1"})
 public class ExtraDaysCase1RuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal extraDaysCase1;
+    private java.lang.Number extraDaysCase1;
 
     public ExtraDaysCase1RuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Extra days case 1")
-    public java.math.BigDecimal getExtraDaysCase1() {
+    public java.lang.Number getExtraDaysCase1() {
         return this.extraDaysCase1;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Extra days case 1")
-    public void setExtraDaysCase1(java.math.BigDecimal extraDaysCase1) {
+    public void setExtraDaysCase1(java.lang.Number extraDaysCase1) {
         this.extraDaysCase1 = extraDaysCase1;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2.java
index 087866d79..27cb4547a 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2.java
@@ -27,7 +27,7 @@ public ExtraDaysCase2() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), (input_.get("Years of Service") != null ? number(input_.get("Years of Service")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Extra days case 2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -50,7 +50,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase2Arguments_);
 
             // Evaluate decision 'Extra days case 2'
-            java.math.BigDecimal output_ = lambda.apply(age, yearsOfService, context_);
+            java.lang.Number output_ = lambda.apply(age, yearsOfService, context_);
 
             // End decision 'Extra days case 2'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase2Arguments_, output_, (System.currentTimeMillis() - extraDaysCase2StartTime_));
@@ -62,11 +62,11 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal yearsOfService = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number yearsOfService = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -79,7 +79,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule1(age, yearsOfService, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = number("0");
@@ -93,7 +93,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -125,7 +125,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2RuleOutput.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2RuleOutput.java
index 43c315867..4014b15d8 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2RuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase2RuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "Extra days case 2"})
 public class ExtraDaysCase2RuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal extraDaysCase2;
+    private java.lang.Number extraDaysCase2;
 
     public ExtraDaysCase2RuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Extra days case 2")
-    public java.math.BigDecimal getExtraDaysCase2() {
+    public java.lang.Number getExtraDaysCase2() {
         return this.extraDaysCase2;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Extra days case 2")
-    public void setExtraDaysCase2(java.math.BigDecimal extraDaysCase2) {
+    public void setExtraDaysCase2(java.lang.Number extraDaysCase2) {
         this.extraDaysCase2 = extraDaysCase2;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3.java
index ef52b5b27..7d199601a 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3.java
@@ -27,7 +27,7 @@ public ExtraDaysCase3() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), (input_.get("Years of Service") != null ? number(input_.get("Years of Service")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Extra days case 3'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -50,7 +50,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, extraDaysCase3Arguments_);
 
             // Evaluate decision 'Extra days case 3'
-            java.math.BigDecimal output_ = lambda.apply(age, yearsOfService, context_);
+            java.lang.Number output_ = lambda.apply(age, yearsOfService, context_);
 
             // End decision 'Extra days case 3'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, extraDaysCase3Arguments_, output_, (System.currentTimeMillis() - extraDaysCase3StartTime_));
@@ -62,11 +62,11 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal yearsOfService = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number yearsOfService = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -79,7 +79,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 ruleOutputList_.add(rule1(age, yearsOfService, context_));
 
                 // Return results based on hit policy
-                java.math.BigDecimal output_;
+                java.lang.Number output_;
                 if (ruleOutputList_.noMatchedRules()) {
                     // Default value
                     output_ = number("0");
@@ -93,7 +93,7 @@ public java.math.BigDecimal apply(Object... args_) {
     };
 
     @com.gs.dmn.runtime.annotation.Rule(index = 0, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule0(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(0, "");
 
@@ -125,7 +125,7 @@ public com.gs.dmn.runtime.RuleOutput rule0(java.math.BigDecimal age, java.math.B
     }
 
     @com.gs.dmn.runtime.annotation.Rule(index = 1, annotation = "")
-    public com.gs.dmn.runtime.RuleOutput rule1(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.RuleOutput rule1(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         // Rule metadata
         com.gs.dmn.runtime.listener.Rule drgRuleMetadata = new com.gs.dmn.runtime.listener.Rule(1, "");
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3RuleOutput.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3RuleOutput.java
index a6b5f2f75..4c92fcda1 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3RuleOutput.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/ExtraDaysCase3RuleOutput.java
@@ -3,19 +3,19 @@
 
 @javax.annotation.Generated(value = {"decisionTableRuleOutput.ftl", "Extra days case 3"})
 public class ExtraDaysCase3RuleOutput extends com.gs.dmn.runtime.RuleOutput {
-    private java.math.BigDecimal extraDaysCase3;
+    private java.lang.Number extraDaysCase3;
 
     public ExtraDaysCase3RuleOutput(boolean matched) {
         super(matched);
     }
 
     @com.fasterxml.jackson.annotation.JsonGetter("Extra days case 3")
-    public java.math.BigDecimal getExtraDaysCase3() {
+    public java.lang.Number getExtraDaysCase3() {
         return this.extraDaysCase3;
     }
 
     @com.fasterxml.jackson.annotation.JsonSetter("Extra days case 3")
-    public void setExtraDaysCase3(java.math.BigDecimal extraDaysCase3) {
+    public void setExtraDaysCase3(java.lang.Number extraDaysCase3) {
         this.extraDaysCase3 = extraDaysCase3;
     }
 
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/TotalVacationDays.java b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/TotalVacationDays.java
index 911bbaa57..4968d61a3 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/TotalVacationDays.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0020-vacation-days/translator/expected/aws/dmn/f0020vacationdays/src/main/java/TotalVacationDays.java
@@ -40,7 +40,7 @@ public TotalVacationDays(BaseVacationDays baseVacationDays, ExtraDaysCase1 extra
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("Age") != null ? number(input_.get("Age")) : null), (input_.get("Years of Service") != null ? number(input_.get("Years of Service")) : null), context_);
         } catch (Exception e) {
@@ -49,7 +49,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number age, java.lang.Number yearsOfService, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'Total Vacation Days'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -63,7 +63,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, totalVacationDaysArguments_);
 
             // Evaluate decision 'Total Vacation Days'
-            java.math.BigDecimal output_ = lambda.apply(age, yearsOfService, context_);
+            java.lang.Number output_ = lambda.apply(age, yearsOfService, context_);
 
             // End decision 'Total Vacation Days'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, totalVacationDaysArguments_, output_, (System.currentTimeMillis() - totalVacationDaysStartTime_));
@@ -75,11 +75,11 @@ public java.math.BigDecimal apply(java.math.BigDecimal age, java.math.BigDecimal
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal age = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
-                java.math.BigDecimal yearsOfService = 1 < args_.length ? (java.math.BigDecimal) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number age = 0 < args_.length ? (java.lang.Number) args_[0] : null;
+                java.lang.Number yearsOfService = 1 < args_.length ? (java.lang.Number) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -87,10 +87,10 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal baseVacationDays = TotalVacationDays.this.baseVacationDays.apply(context_);
-                java.math.BigDecimal extraDaysCase1 = TotalVacationDays.this.extraDaysCase1.apply(age, yearsOfService, context_);
-                java.math.BigDecimal extraDaysCase2 = TotalVacationDays.this.extraDaysCase2.apply(age, yearsOfService, context_);
-                java.math.BigDecimal extraDaysCase3 = TotalVacationDays.this.extraDaysCase3.apply(age, yearsOfService, context_);
+                java.lang.Number baseVacationDays = TotalVacationDays.this.baseVacationDays.apply(context_);
+                java.lang.Number extraDaysCase1 = TotalVacationDays.this.extraDaysCase1.apply(age, yearsOfService, context_);
+                java.lang.Number extraDaysCase2 = TotalVacationDays.this.extraDaysCase2.apply(age, yearsOfService, context_);
+                java.lang.Number extraDaysCase3 = TotalVacationDays.this.extraDaysCase3.apply(age, yearsOfService, context_);
 
                 return numericAdd(numericAdd(baseVacationDays, max(extraDaysCase1, extraDaysCase3)), extraDaysCase2);
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_003_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_003_1.java
index 92059e683..b28d02446 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_003_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_003_1.java
@@ -34,7 +34,7 @@ private Bkm_003_1() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_003_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -55,7 +55,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_003_1Arguments_);
 
             // Evaluate BKM 'bkm_003_1'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(context_);
 
             // End BKM 'bkm_003_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_003_1Arguments_, output_, (System.currentTimeMillis() - bkm_003_1StartTime_));
@@ -67,16 +67,16 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0];return numericAdd(number("1"), a);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0];return numericAdd(number("1"), a);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_004_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_004_1.java
index 680c8390b..35f9af236 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_004_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_004_1.java
@@ -34,7 +34,7 @@ private Bkm_004_1() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_004_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -55,7 +55,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_004_1Arguments_);
 
             // Evaluate BKM 'bkm_004_1'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(context_);
 
             // End BKM 'bkm_004_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_004_1Arguments_, output_, (System.currentTimeMillis() - bkm_004_1StartTime_));
@@ -67,16 +67,16 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0];return numericAdd(number("1"), a);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0];return numericAdd(number("1"), a);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_005_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_005_1.java
index 092138147..793d5ab7e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_005_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_005_1.java
@@ -34,7 +34,7 @@ private Bkm_005_1() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("a") != null ? number(input_.get("a")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math.BigDecimal a, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(java.lang.Number a, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_005_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_005_1Arguments_);
 
             // Evaluate BKM 'bkm_005_1'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(a, context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(a, context_);
 
             // End BKM 'bkm_005_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_005_1Arguments_, output_, (System.currentTimeMillis() - bkm_005_1StartTime_));
@@ -68,17 +68,17 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
-                java.math.BigDecimal a = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
+                java.lang.Number a = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal b = (java.math.BigDecimal)args_[0];return numericMultiply(a, b);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number b = (java.lang.Number)args_[0];return numericMultiply(a, b);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_006_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_006_1.java
index 23d74b685..a82305118 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_006_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_006_1.java
@@ -34,7 +34,7 @@ private Bkm_006_1() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("a") != null ? number(input_.get("a")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math.BigDecimal a, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(java.lang.Number a, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_006_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_006_1Arguments_);
 
             // Evaluate BKM 'bkm_006_1'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(a, context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(a, context_);
 
             // End BKM 'bkm_006_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_006_1Arguments_, output_, (System.currentTimeMillis() - bkm_006_1StartTime_));
@@ -68,17 +68,17 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
-                java.math.BigDecimal a = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
+                java.lang.Number a = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal b = (java.math.BigDecimal)args_[0];return numericMultiply(a, b);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number b = (java.lang.Number)args_[0];return numericMultiply(a, b);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_008_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_008_1.java
index 4230acd42..96d5293cb 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_008_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_008_1.java
@@ -34,7 +34,7 @@ private Bkm_008_1() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("a") != null ? number(input_.get("a")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math.BigDecimal a, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(java.lang.Number a, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_008_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_008_1Arguments_);
 
             // Evaluate BKM 'bkm_008_1'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(a, context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(a, context_);
 
             // End BKM 'bkm_008_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_008_1Arguments_, output_, (System.currentTimeMillis() - bkm_008_1StartTime_));
@@ -68,17 +68,17 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
-                java.math.BigDecimal a = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
+                java.lang.Number a = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0]; java.math.BigDecimal b = (java.math.BigDecimal)args_[1];return numericMultiply(a, b);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0]; java.lang.Number b = (java.lang.Number)args_[1];return numericMultiply(a, b);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_009_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_009_1.java
index 4b684a6b3..802ccec71 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_009_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_009_1.java
@@ -34,7 +34,7 @@ private Bkm_009_1() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("a") != null ? number(input_.get("a")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math.BigDecimal a, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(java.lang.Number a, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_009_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_009_1Arguments_);
 
             // Evaluate BKM 'bkm_009_1'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(a, context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(a, context_);
 
             // End BKM 'bkm_009_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_009_1Arguments_, output_, (System.currentTimeMillis() - bkm_009_1StartTime_));
@@ -68,17 +68,17 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
-                java.math.BigDecimal a = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
+                java.lang.Number a = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal b = (java.math.BigDecimal)args_[0];return numericMultiply(a, b);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number b = (java.lang.Number)args_[0];return numericMultiply(a, b);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1.java
index ad554344d..f8328f94e 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1.java
@@ -34,7 +34,7 @@ private Bkm_010_1() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("a") != null ? number(input_.get("a")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<c
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>> apply(java.math.BigDecimal a, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>> apply(java.lang.Number a, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_010_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<c
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_010_1Arguments_);
 
             // Evaluate BKM 'bkm_010_1'
-            com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>> output_ = lambda.apply(a, context_);
+            com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>> output_ = lambda.apply(a, context_);
 
             // End BKM 'bkm_010_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_010_1Arguments_, output_, (System.currentTimeMillis() - bkm_010_1StartTime_));
@@ -68,17 +68,17 @@ public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<c
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>>>() {
-            public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>> apply(Object... args_) {
-                java.math.BigDecimal a = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>>>() {
+            public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>> apply(Object... args_) {
+                java.lang.Number a = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>>() {public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> apply(Object... args_) {java.math.BigDecimal b = (java.math.BigDecimal)args_[0];return new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {java.math.BigDecimal c = (java.math.BigDecimal)args_[0];return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal d = (java.math.BigDecimal)args_[0];return numericMultiply(numericMultiply(numericMultiply(a, b), c), d);}};}};}};
+                return new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>>() {public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> apply(Object... args_) {java.lang.Number b = (java.lang.Number)args_[0];return new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {java.lang.Number c = (java.lang.Number)args_[0];return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number d = (java.lang.Number)args_[0];return numericMultiply(numericMultiply(numericMultiply(a, b), c), d);}};}};}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1_a.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1_a.java
index 72391662d..19f53684d 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1_a.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_010_1_a.java
@@ -34,7 +34,7 @@ private Bkm_010_1_a() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("a") != null ? number(input_.get("a")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<c
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>> apply(java.math.BigDecimal a, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>> apply(java.lang.Number a, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_010_1_a'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<c
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_010_1_aArguments_);
 
             // Evaluate BKM 'bkm_010_1_a'
-            com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>> output_ = lambda.apply(a, context_);
+            com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>> output_ = lambda.apply(a, context_);
 
             // End BKM 'bkm_010_1_a'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_010_1_aArguments_, output_, (System.currentTimeMillis() - bkm_010_1_aStartTime_));
@@ -68,17 +68,17 @@ public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<c
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>>>() {
-            public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>> apply(Object... args_) {
-                java.math.BigDecimal a = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>>>() {
+            public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>> apply(Object... args_) {
+                java.lang.Number a = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>>() {public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> apply(Object... args_) {java.math.BigDecimal b = (java.math.BigDecimal)args_[0];return new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {java.math.BigDecimal c = (java.math.BigDecimal)args_[0];return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal d = (java.math.BigDecimal)args_[0];return numericMultiply(numericMultiply(numericMultiply(a, b), c), d);}};}};}};
+                return new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>>() {public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> apply(Object... args_) {java.lang.Number b = (java.lang.Number)args_[0];return new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {java.lang.Number c = (java.lang.Number)args_[0];return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number d = (java.lang.Number)args_[0];return numericMultiply(numericMultiply(numericMultiply(a, b), c), d);}};}};}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_011_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_011_1.java
index b61277e4b..543db7144 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_011_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_011_1.java
@@ -34,11 +34,11 @@ private Bkm_011_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         throw new com.gs.dmn.runtime.DMNRuntimeException("Not all arguments can be serialized");
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn1, com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn2, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn1, com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn2, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_011_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -52,7 +52,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_011_1Arguments_);
 
             // Evaluate BKM 'bkm_011_1'
-            java.math.BigDecimal output_ = lambda.apply(fn1, fn2, context_);
+            java.lang.Number output_ = lambda.apply(fn1, fn2, context_);
 
             // End BKM 'bkm_011_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_011_1Arguments_, output_, (System.currentTimeMillis() - bkm_011_1StartTime_));
@@ -64,11 +64,11 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn1 = 0 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>) args_[0] : null;
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn2 = 1 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn1 = 0 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.lang.Number>) args_[0] : null;
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn2 = 1 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.lang.Number>) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_1.java
index 06c8a57f0..02ada44e9 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_1.java
@@ -34,11 +34,11 @@ private Bkm_012_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         throw new com.gs.dmn.runtime.DMNRuntimeException("Not all arguments can be serialized");
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn1, com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn2, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn1, com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn2, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_012_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -52,7 +52,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_012_1Arguments_);
 
             // Evaluate BKM 'bkm_012_1'
-            java.math.BigDecimal output_ = lambda.apply(fn1, fn2, context_);
+            java.lang.Number output_ = lambda.apply(fn1, fn2, context_);
 
             // End BKM 'bkm_012_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_012_1Arguments_, output_, (System.currentTimeMillis() - bkm_012_1StartTime_));
@@ -64,11 +64,11 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn1 = 0 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>) args_[0] : null;
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn2 = 1 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn1 = 0 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.lang.Number>) args_[0] : null;
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn2 = 1 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.lang.Number>) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_2.java
index 0c76ec6bd..920fe7c20 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_012_2.java
@@ -34,7 +34,7 @@ private Bkm_012_2() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("a") != null ? number(input_.get("a")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal a, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number a, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_012_2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal a, com.gs.dmn.runtime.Exe
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_012_2Arguments_);
 
             // Evaluate BKM 'bkm_012_2'
-            java.math.BigDecimal output_ = lambda.apply(a, context_);
+            java.lang.Number output_ = lambda.apply(a, context_);
 
             // End BKM 'bkm_012_2'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_012_2Arguments_, output_, (System.currentTimeMillis() - bkm_012_2StartTime_));
@@ -68,10 +68,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal a, com.gs.dmn.runtime.Exe
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal a = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number a = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_013_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_013_1.java
index 649e8e6f3..71727f2f1 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_013_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Bkm_013_1.java
@@ -34,11 +34,11 @@ private Bkm_013_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         throw new com.gs.dmn.runtime.DMNRuntimeException("Not all arguments can be serialized");
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn1, com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn2, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn1, com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn2, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start BKM 'bkm_013_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -52,7 +52,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, bkm_013_1Arguments_);
 
             // Evaluate BKM 'bkm_013_1'
-            java.math.BigDecimal output_ = lambda.apply(fn1, fn2, context_);
+            java.lang.Number output_ = lambda.apply(fn1, fn2, context_);
 
             // End BKM 'bkm_013_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, bkm_013_1Arguments_, output_, (System.currentTimeMillis() - bkm_013_1StartTime_));
@@ -64,11 +64,11 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.LambdaExpression<java.math.
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn1 = 0 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>) args_[0] : null;
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> fn2 = 1 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>) args_[1] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn1 = 0 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.lang.Number>) args_[0] : null;
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> fn2 = 1 < args_.length ? (com.gs.dmn.runtime.LambdaExpression<java.lang.Number>) args_[1] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 2 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[2] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DecisionService_013_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DecisionService_013_1.java
index 4906fb05e..000d32eed 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DecisionService_013_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/DecisionService_013_1.java
@@ -41,7 +41,7 @@ private DecisionService_013_1(Decision_013_2 decision_013_2) {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("input_013_1") != null ? number(input_.get("input_013_1")) : null), context_);
         } catch (Exception e) {
@@ -50,7 +50,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal input_013_1, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number input_013_1, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start DS 'decisionService_013_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -63,7 +63,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal input_013_1, com.gs.dmn.r
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decisionService_013_1Arguments_);
 
             // Evaluate DS 'decisionService_013_1'
-            java.math.BigDecimal output_ = lambda.apply(input_013_1, context_);
+            java.lang.Number output_ = lambda.apply(input_013_1, context_);
 
             // End DS 'decisionService_013_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decisionService_013_1Arguments_, output_, (System.currentTimeMillis() - decisionService_013_1StartTime_));
@@ -75,10 +75,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal input_013_1, com.gs.dmn.r
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal input_013_1 = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number input_013_1 = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -86,7 +86,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                java.math.BigDecimal decision_013_2 = DecisionService_013_1.this.decision_013_2.apply(input_013_1, context_);
+                java.lang.Number decision_013_2 = DecisionService_013_1.this.decision_013_2.apply(input_013_1, context_);
 
                 return decision_013_2;
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_1.java
index 36767621a..c12554b6b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_1.java
@@ -34,7 +34,7 @@ public Decision_001_1(Decision_001_2 decision_001_2) {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_001_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -55,7 +55,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_001_1Arguments_);
 
             // Evaluate decision 'decision_001_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_001_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_001_1Arguments_, output_, (System.currentTimeMillis() - decision_001_1StartTime_));
@@ -67,9 +67,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -77,7 +77,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> decision_001_2 = Decision_001_1.this.decision_001_2.apply(context_);
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> decision_001_2 = Decision_001_1.this.decision_001_2.apply(context_);
 
                 return decision_001_2.apply(number("2"), context_);
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_2.java
index 46381b31e..928a13978 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_001_2.java
@@ -27,7 +27,7 @@ public Decision_001_2() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_001_2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_001_2Arguments_);
 
             // Evaluate decision 'decision_001_2'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(context_);
 
             // End decision 'decision_001_2'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_001_2Arguments_, output_, (System.currentTimeMillis() - decision_001_2StartTime_));
@@ -60,16 +60,16 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0];return numericAdd(number("1"), a);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0];return numericAdd(number("1"), a);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_1.java
index 94b957e6f..a0a3c0f51 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_1.java
@@ -34,7 +34,7 @@ public Decision_002_1(Decision_002_2 decision_002_2) {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_002_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -55,7 +55,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_002_1Arguments_);
 
             // Evaluate decision 'decision_002_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_002_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_002_1Arguments_, output_, (System.currentTimeMillis() - decision_002_1StartTime_));
@@ -67,9 +67,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -77,7 +77,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> decision_002_2 = Decision_002_1.this.decision_002_2.apply(context_);
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> decision_002_2 = Decision_002_1.this.decision_002_2.apply(context_);
 
                 return decision_002_2.apply(number("3"), context_);
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_2.java
index d5538bd05..a71ae8645 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_002_2.java
@@ -27,7 +27,7 @@ public Decision_002_2() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_002_2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_002_2Arguments_);
 
             // Evaluate decision 'decision_002_2'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(context_);
 
             // End decision 'decision_002_2'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_002_2Arguments_, output_, (System.currentTimeMillis() - decision_002_2StartTime_));
@@ -60,16 +60,16 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0];return numericAdd(number("1"), a);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0];return numericAdd(number("1"), a);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_003_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_003_1.java
index 1a548f786..b6c90c8c9 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_003_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_003_1.java
@@ -27,7 +27,7 @@ public Decision_003_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_003_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_003_1Arguments_);
 
             // Evaluate decision 'decision_003_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_003_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_003_1Arguments_, output_, (System.currentTimeMillis() - decision_003_1StartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_004_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_004_1.java
index 224e0ac74..b846333f4 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_004_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_004_1.java
@@ -27,7 +27,7 @@ public Decision_004_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_004_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_004_1Arguments_);
 
             // Evaluate decision 'decision_004_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_004_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_004_1Arguments_, output_, (System.currentTimeMillis() - decision_004_1StartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_005_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_005_1.java
index 3f292854e..25c1a2c72 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_005_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_005_1.java
@@ -27,7 +27,7 @@ public Decision_005_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_005_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_005_1Arguments_);
 
             // Evaluate decision 'decision_005_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_005_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_005_1Arguments_, output_, (System.currentTimeMillis() - decision_005_1StartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_006_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_006_1.java
index 66d3af877..8e7945a50 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_006_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_006_1.java
@@ -27,7 +27,7 @@ public Decision_006_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_006_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_006_1Arguments_);
 
             // Evaluate decision 'decision_006_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_006_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_006_1Arguments_, output_, (System.currentTimeMillis() - decision_006_1StartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_1.java
index 91b41eb4a..234743295 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_1.java
@@ -34,7 +34,7 @@ public Decision_007_1(Decision_007_2 decision_007_2) {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("input_007_1") != null ? number(input_.get("input_007_1")) : null), context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal input_007_1, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number input_007_1, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_007_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -56,7 +56,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal input_007_1, com.gs.dmn.r
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_007_1Arguments_);
 
             // Evaluate decision 'decision_007_1'
-            java.math.BigDecimal output_ = lambda.apply(input_007_1, context_);
+            java.lang.Number output_ = lambda.apply(input_007_1, context_);
 
             // End decision 'decision_007_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_007_1Arguments_, output_, (System.currentTimeMillis() - decision_007_1StartTime_));
@@ -68,10 +68,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal input_007_1, com.gs.dmn.r
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal input_007_1 = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number input_007_1 = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -79,7 +79,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> decision_007_2 = Decision_007_1.this.decision_007_2.apply(input_007_1, context_);
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> decision_007_2 = Decision_007_1.this.decision_007_2.apply(input_007_1, context_);
 
                 return decision_007_2.apply(number("5"), context_);
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_2.java
index e15e3383a..43405e03b 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_007_2.java
@@ -27,7 +27,7 @@ public Decision_007_2() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("input_007_1") != null ? number(input_.get("input_007_1")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math.BigDecimal input_007_1, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(java.lang.Number input_007_1, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_007_2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -49,7 +49,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_007_2Arguments_);
 
             // Evaluate decision 'decision_007_2'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(input_007_1, context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(input_007_1, context_);
 
             // End decision 'decision_007_2'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_007_2Arguments_, output_, (System.currentTimeMillis() - decision_007_2StartTime_));
@@ -61,17 +61,17 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(java.math
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
-                java.math.BigDecimal input_007_1 = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
+                java.lang.Number input_007_1 = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0];return numericMultiply(a, input_007_1);}};
+                return new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0];return numericMultiply(a, input_007_1);}};
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_008_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_008_1.java
index 09a1587e5..9e436abb0 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_008_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_008_1.java
@@ -27,7 +27,7 @@ public Decision_008_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_008_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_008_1Arguments_);
 
             // Evaluate decision 'decision_008_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_008_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_008_1Arguments_, output_, (System.currentTimeMillis() - decision_008_1StartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_009_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_009_1.java
index 93140ecf6..2035b4d50 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_009_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_009_1.java
@@ -27,7 +27,7 @@ public Decision_009_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_009_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_009_1Arguments_);
 
             // Evaluate decision 'decision_009_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_009_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_009_1Arguments_, output_, (System.currentTimeMillis() - decision_009_1StartTime_));
@@ -60,16 +60,16 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                java.math.BigDecimal a = number("10");
+                java.lang.Number a = number("10");
                 return Bkm_009_1.instance().apply(number("100"), context_).apply(number("2"), context_);
             }
         };
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1.java
index c8ed4bea6..c331cccb8 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1.java
@@ -34,7 +34,7 @@ public Decision_010_1(Decision_010_2 decision_010_2) {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_010_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -55,7 +55,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_010_1Arguments_);
 
             // Evaluate decision 'decision_010_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_010_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_010_1Arguments_, output_, (System.currentTimeMillis() - decision_010_1StartTime_));
@@ -67,9 +67,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -77,7 +77,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> decision_010_2 = Decision_010_1.this.decision_010_2.apply(context_);
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> decision_010_2 = Decision_010_1.this.decision_010_2.apply(context_);
 
                 return decision_010_2.apply(number("5"), context_);
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1_a.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1_a.java
index e8da0fa22..4d68034c2 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1_a.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_1_a.java
@@ -34,7 +34,7 @@ public Decision_010_1_a(Decision_010_2_a decision_010_2_a) {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -43,7 +43,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_010_1_a'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -55,7 +55,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_010_1_aArguments_);
 
             // Evaluate decision 'decision_010_1_a'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_010_1_a'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_010_1_aArguments_, output_, (System.currentTimeMillis() - decision_010_1_aStartTime_));
@@ -67,9 +67,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
@@ -77,7 +77,7 @@ public java.math.BigDecimal apply(Object... args_) {
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
                 // Apply child decisions
-                com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> decision_010_2_a = Decision_010_1_a.this.decision_010_2_a.apply(context_);
+                com.gs.dmn.runtime.LambdaExpression<java.lang.Number> decision_010_2_a = Decision_010_1_a.this.decision_010_2_a.apply(context_);
 
                 return decision_010_2_a.apply(number("5"), context_);
             }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2.java
index 30b177961..e8719dc39 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2.java
@@ -27,7 +27,7 @@ public Decision_010_2() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_010_2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_010_2Arguments_);
 
             // Evaluate decision 'decision_010_2'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(context_);
 
             // End decision 'decision_010_2'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_010_2Arguments_, output_, (System.currentTimeMillis() - decision_010_2StartTime_));
@@ -60,9 +60,9 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2_a.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2_a.java
index 1e89f1784..0cd2b8436 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2_a.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_010_2_a.java
@@ -27,7 +27,7 @@ public Decision_010_2_a() {
     }
 
     @java.lang.Override()
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> applyMap(java.u
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_010_2_a'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_010_2_aArguments_);
 
             // Evaluate decision 'decision_010_2_a'
-            com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> output_ = lambda.apply(context_);
+            com.gs.dmn.runtime.LambdaExpression<java.lang.Number> output_ = lambda.apply(context_);
 
             // End decision 'decision_010_2_a'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_010_2_aArguments_, output_, (System.currentTimeMillis() - decision_010_2_aStartTime_));
@@ -60,9 +60,9 @@ public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(com.gs.dm
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>>() {
-            public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<com.gs.dmn.runtime.LambdaExpression<java.lang.Number>>() {
+            public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_011_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_011_1.java
index e07b6f50e..a3a1adb45 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_011_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_011_1.java
@@ -27,7 +27,7 @@ public Decision_011_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("input_011_1") != null ? number(input_.get("input_011_1")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal input_011_1, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number input_011_1, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_011_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -49,7 +49,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal input_011_1, com.gs.dmn.r
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_011_1Arguments_);
 
             // Evaluate decision 'decision_011_1'
-            java.math.BigDecimal output_ = lambda.apply(input_011_1, context_);
+            java.lang.Number output_ = lambda.apply(input_011_1, context_);
 
             // End decision 'decision_011_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_011_1Arguments_, output_, (System.currentTimeMillis() - decision_011_1StartTime_));
@@ -61,17 +61,17 @@ public java.math.BigDecimal apply(java.math.BigDecimal input_011_1, com.gs.dmn.r
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal input_011_1 = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number input_011_1 = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
                 com.gs.dmn.runtime.external.ExternalFunctionExecutor externalExecutor_ = context_ != null ? context_.getExternalFunctionExecutor() : null;
                 com.gs.dmn.runtime.cache.Cache cache_ = context_ != null ? context_.getCache() : null;
 
-                return Bkm_011_1.instance().apply(new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal a = (java.math.BigDecimal)args_[0];return numericMultiply(input_011_1, a);}}, new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {public java.math.BigDecimal apply(Object... args_) {java.math.BigDecimal b = (java.math.BigDecimal)args_[0];return numericMultiply(input_011_1, b);}}, context_);
+                return Bkm_011_1.instance().apply(new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number a = (java.lang.Number)args_[0];return numericMultiply(input_011_1, a);}}, new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {public java.lang.Number apply(Object... args_) {java.lang.Number b = (java.lang.Number)args_[0];return numericMultiply(input_011_1, b);}}, context_);
             }
         };
 }
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_012_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_012_1.java
index 36a73933e..af2dd3440 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_012_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_012_1.java
@@ -27,7 +27,7 @@ public Decision_012_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_012_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_012_1Arguments_);
 
             // Evaluate decision 'decision_012_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_012_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_012_1Arguments_, output_, (System.currentTimeMillis() - decision_012_1StartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_1.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_1.java
index 1849367bd..b0b1f1be5 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_1.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_1.java
@@ -27,7 +27,7 @@ public Decision_013_1() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply(context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_013_1'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -48,7 +48,7 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_013_1Arguments_);
 
             // Evaluate decision 'decision_013_1'
-            java.math.BigDecimal output_ = lambda.apply(context_);
+            java.lang.Number output_ = lambda.apply(context_);
 
             // End decision 'decision_013_1'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_013_1Arguments_, output_, (System.currentTimeMillis() - decision_013_1StartTime_));
@@ -60,9 +60,9 @@ public java.math.BigDecimal apply(com.gs.dmn.runtime.ExecutionContext context_)
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
                 com.gs.dmn.runtime.ExecutionContext context_ = 0 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[0] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;
diff --git a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_2.java b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_2.java
index 191a5e9fb..78fae4f8c 100644
--- a/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_2.java
+++ b/dmn-test-cases/standard/tck/1.3/cl3/0092-feel-lambda/translator/expected/java/dmn/Decision_013_2.java
@@ -27,7 +27,7 @@ public Decision_013_2() {
     }
 
     @java.lang.Override()
-    public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number applyMap(java.util.Map<String, String> input_, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             return apply((input_.get("input_013_1") != null ? number(input_.get("input_013_1")) : null), context_);
         } catch (Exception e) {
@@ -36,7 +36,7 @@ public java.math.BigDecimal applyMap(java.util.Map<String, String> input_, com.g
         }
     }
 
-    public java.math.BigDecimal apply(java.math.BigDecimal input_013_1, com.gs.dmn.runtime.ExecutionContext context_) {
+    public java.lang.Number apply(java.lang.Number input_013_1, com.gs.dmn.runtime.ExecutionContext context_) {
         try {
             // Start decision 'decision_013_2'
             com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
@@ -49,7 +49,7 @@ public java.math.BigDecimal apply(java.math.BigDecimal input_013_1, com.gs.dmn.r
             eventListener_.startDRGElement(DRG_ELEMENT_METADATA, decision_013_2Arguments_);
 
             // Evaluate decision 'decision_013_2'
-            java.math.BigDecimal output_ = lambda.apply(input_013_1, context_);
+            java.lang.Number output_ = lambda.apply(input_013_1, context_);
 
             // End decision 'decision_013_2'
             eventListener_.endDRGElement(DRG_ELEMENT_METADATA, decision_013_2Arguments_, output_, (System.currentTimeMillis() - decision_013_2StartTime_));
@@ -61,10 +61,10 @@ public java.math.BigDecimal apply(java.math.BigDecimal input_013_1, com.gs.dmn.r
         }
     }
 
-    public com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal> lambda =
-        new com.gs.dmn.runtime.LambdaExpression<java.math.BigDecimal>() {
-            public java.math.BigDecimal apply(Object... args_) {
-                java.math.BigDecimal input_013_1 = 0 < args_.length ? (java.math.BigDecimal) args_[0] : null;
+    public com.gs.dmn.runtime.LambdaExpression<java.lang.Number> lambda =
+        new com.gs.dmn.runtime.LambdaExpression<java.lang.Number>() {
+            public java.lang.Number apply(Object... args_) {
+                java.lang.Number input_013_1 = 0 < args_.length ? (java.lang.Number) args_[0] : null;
                 com.gs.dmn.runtime.ExecutionContext context_ = 1 < args_.length ? (com.gs.dmn.runtime.ExecutionContext) args_[1] : null;
                 com.gs.dmn.runtime.annotation.AnnotationSet annotationSet_ = context_ != null ? context_.getAnnotations() : null;
                 com.gs.dmn.runtime.listener.EventListener eventListener_ = context_ != null ? context_.getEventListener() : null;