diff --git a/json-serde-cdh7-shim/pom.xml b/json-serde-cdh7-shim/pom.xml
index 5a20b7b..97708dd 100644
--- a/json-serde-cdh7-shim/pom.xml
+++ b/json-serde-cdh7-shim/pom.xml
@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-	<groupId>io.starburst.openx.data</groupId>
-	<artifactId>json-serde-parent</artifactId>
-	<relativePath>../pom.xml</relativePath>
-	<version>1.3.9-e.9-SNAPSHOT</version>
+        <groupId>io.starburst.openx.data</groupId>
+        <artifactId>json-serde-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.3.9-e.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,43 +15,49 @@
 
     <name>json-cdh7-shim</name>
 
-<build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-	</plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
-		<dependency>
-			<groupId>io.starburst.openjson</groupId>
-			<artifactId>openjson</artifactId>
-			<version>${openjson.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-	<dependency>
-	    <groupId>org.apache.hive</groupId>
-	    <artifactId>hive-serde</artifactId>
-	    <version>${cdh7.hive.version}</version>
-	    <scope>provided</scope>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.hive</groupId>
-	    <artifactId>hive-exec</artifactId>
-	    <version>${cdh7.hive.version}</version>
-	    <scope>provided</scope>
-	</dependency>
-
-	<dependency>
-	    <groupId>org.apache.hadoop</groupId>
-	    <artifactId>${hadoop.dependency}</artifactId>
-	    <version>${cdh7.hadoop.version}</version>
-	    <scope>provided</scope>
-	</dependency>
+        <dependency>
+            <groupId>io.starburst.openjson</groupId>
+            <artifactId>openjson</artifactId>
+            <version>${openjson.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-serde</artifactId>
+            <version>${cdh7.hive.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-exec</artifactId>
+            <version>${cdh7.hive.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>${hadoop.dependency}</artifactId>
+            <version>${cdh7.hadoop.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
+
+    <repositories>
+        <repository>
+            <id>Cloudera</id>
+            <name>Cloudera Maven Repo</name>
+            <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+        </repository>
+    </repositories>
 </project>
 
 
diff --git a/json-serde-generic-shim/pom.xml b/json-serde-generic-shim/pom.xml
new file mode 100644
index 0000000..13d877d
--- /dev/null
+++ b/json-serde-generic-shim/pom.xml
@@ -0,0 +1,56 @@
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>io.starburst.openx.data</groupId>
+        <artifactId>json-serde-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.3.9-e.9-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>io.starburst.openx.data</groupId>
+    <artifactId>json-serde-generic-shim</artifactId>
+    <packaging>jar</packaging>
+
+    <name>json-generic-shim</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.starburst.openjson</groupId>
+            <artifactId>openjson</artifactId>
+            <version>${openjson.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-serde</artifactId>
+            <version>${generic.hive.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-exec</artifactId>
+            <version>${generic.hive.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>${hadoop.dependency}</artifactId>
+            <version>${generic.hadoop.version}</version>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
+</project>
+
+
+
diff --git a/json-serde-generic-shim/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/TypeEntryShim.java b/json-serde-generic-shim/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/TypeEntryShim.java
new file mode 100644
index 0000000..d053646
--- /dev/null
+++ b/json-serde-generic-shim/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/TypeEntryShim.java
@@ -0,0 +1,39 @@
+/*======================================================================*
+ * Copyright (c) 2011, OpenX Technologies, Inc. All rights reserved.    *
+ *                                                                      *
+ * Licensed under the New BSD License (the "License"); you may not use  *
+ * this file except in compliance with the License. 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. See accompanying LICENSE file.        *
+ *======================================================================*/
+
+package org.openx.data.jsonserde.objectinspector.primitive;
+
+import org.apache.hadoop.hive.serde2.objectinspector.primitive.AbstractPrimitiveJavaObjectInspector;
+import org.apache.hadoop.hive.serde2.typeinfo.DecimalTypeInfo;
+import org.apache.hadoop.hive.serde2.typeinfo.PrimitiveTypeInfo;
+import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ *
+ * @author Roberto Congiu <rcongiu@yahoo.com>
+ */
+public class TypeEntryShim {
+    public static PrimitiveTypeInfo byteType   = TypeInfoFactory.byteTypeInfo;
+    public static PrimitiveTypeInfo doubleType = TypeInfoFactory.doubleTypeInfo;
+    public static PrimitiveTypeInfo floatType = TypeInfoFactory.floatTypeInfo;
+    public static PrimitiveTypeInfo intType = TypeInfoFactory.intTypeInfo;
+    public static PrimitiveTypeInfo longType = TypeInfoFactory.longTypeInfo;
+    public static PrimitiveTypeInfo shortType = TypeInfoFactory.shortTypeInfo;
+    public static PrimitiveTypeInfo timestampType = TypeInfoFactory.timestampTypeInfo;
+    public static PrimitiveTypeInfo stringType = TypeInfoFactory.stringTypeInfo;
+    public static PrimitiveTypeInfo binaryType = TypeInfoFactory.binaryTypeInfo;
+    public static PrimitiveTypeInfo booleanType = TypeInfoFactory.booleanTypeInfo;
+    public static PrimitiveTypeInfo dateType = TypeInfoFactory.dateTypeInfo;
+    public static DecimalTypeInfo decimalType = TypeInfoFactory.decimalTypeInfo;
+}
diff --git a/json-serde-hdp3-shim/pom.xml b/json-serde-hdp3-shim/pom.xml
index f540f3b..847539a 100644
--- a/json-serde-hdp3-shim/pom.xml
+++ b/json-serde-hdp3-shim/pom.xml
@@ -2,10 +2,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <parent>
-	<groupId>io.starburst.openx.data</groupId>
-	<artifactId>json-serde-parent</artifactId>
-	<relativePath>../pom.xml</relativePath>
-	<version>1.3.9-e.9-SNAPSHOT</version>
+        <groupId>io.starburst.openx.data</groupId>
+        <artifactId>json-serde-parent</artifactId>
+        <relativePath>../pom.xml</relativePath>
+        <version>1.3.9-e.9-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -15,44 +15,47 @@
 
     <name>json-hdp3-shim</name>
 
-<build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-      </plugin>
-	</plugins>
-  </build>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
-		<dependency>
-			<groupId>io.starburst.openjson</groupId>
-			<artifactId>openjson</artifactId>
-			<version>${openjson.version}</version>
-			<scope>compile</scope>
-		</dependency>
-
-	<dependency>
-	    <groupId>org.apache.hive</groupId>
-	    <artifactId>hive-serde</artifactId>
-	    <version>${hdp3.hive.version}</version>
-	    <scope>provided</scope>
-	</dependency>
-	<dependency>
-	    <groupId>org.apache.hive</groupId>
-	    <artifactId>hive-exec</artifactId>
-	    <version>${hdp3.hive.version}</version>
-	    <scope>provided</scope>
-	</dependency>
-
-	<dependency>
-	    <groupId>org.apache.hadoop</groupId>
-	    <artifactId>${hadoop.dependency}</artifactId>
-	    <version>${hdp3.hadoop.version}</version>
-	    <scope>provided</scope>
-	</dependency>
+        <dependency>
+            <groupId>io.starburst.openjson</groupId>
+            <artifactId>openjson</artifactId>
+            <version>${openjson.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-serde</artifactId>
+            <version>${hdp3.hive.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hive</groupId>
+            <artifactId>hive-exec</artifactId>
+            <version>${hdp3.hive.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hadoop</groupId>
+            <artifactId>${hadoop.dependency}</artifactId>
+            <version>${hdp3.hadoop.version}</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
-</project>
-
-
 
+    <repositories>
+        <repository>
+            <id>HortonWorks</id>
+            <name>HortonWorks Maven Repo</name>
+            <url>https://repo.hortonworks.com/content/repositories/releases/</url>
+        </repository>
+    </repositories>
+</project>
diff --git a/json-serde/pom.xml b/json-serde/pom.xml
index 70d2a4f..35c2bdc 100644
--- a/json-serde/pom.xml
+++ b/json-serde/pom.xml
@@ -104,20 +104,20 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-serde</artifactId>
-            <version>${cdh.hive.version}</version>
+            <version>${hive.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
-            <version>${cdh.hive.version}</version>
+            <version>${hive.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>${hadoop.dependency}</artifactId>
-            <version>${cdh.hadoop.version}</version>
+            <version>${hadoop.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringShortObjectInspector.java b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringShortObjectInspector.java
index 7549be4..fa2ee5b 100644
--- a/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringShortObjectInspector.java
+++ b/json-serde/src/main/java/org/openx/data/jsonserde/objectinspector/primitive/JavaStringShortObjectInspector.java
@@ -17,7 +17,6 @@
 import org.apache.hadoop.hive.serde2.objectinspector.primitive.SettableShortObjectInspector;
 import org.apache.hadoop.io.ByteWritable;
 import org.apache.hadoop.io.IntWritable;
-import org.apache.velocity.runtime.directive.Parse;
 
 import java.math.BigDecimal;
 
diff --git a/json-udf/pom.xml b/json-udf/pom.xml
index d44e961..4a81e62 100644
--- a/json-udf/pom.xml
+++ b/json-udf/pom.xml
@@ -80,20 +80,20 @@
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-serde</artifactId>
-            <version>${cdh.hive.version}</version>
+            <version>${hive.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.hive</groupId>
             <artifactId>hive-exec</artifactId>
-            <version>${cdh.hive.version}</version>
+            <version>${hive.version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>${hadoop.dependency}</artifactId>
-            <version>${cdh.hadoop.version}</version>
+            <version>${hadoop.version}</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/pom.xml b/pom.xml
index 922ccb0..8793bee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,9 @@
         <openjson.version>1.8-e.9-SNAPSHOT</openjson.version>
         <hadoop.dependency>hadoop-common</hadoop.dependency>
 
+        <!-- generic versions -->
+        <generic.hive.version>3.1.3</generic.hive.version>
+        <generic.hadoop.version>3.3.2</generic.hadoop.version>
         <!-- cdh7 versions -->
         <cdh7.version>7.2.14.0-149</cdh7.version>
         <cdh7.hive.version>3.1.3000.${cdh7.version}</cdh7.hive.version>
@@ -50,20 +53,33 @@
 
     <profiles>
         <profile>
-            <id>cdh7</id>
+            <id>generic</id>
             <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>
+            <modules>
+                <module>json-serde-generic-shim</module>
+            </modules>
+            <properties>
+                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+                <serde.shim>json-serde-generic-shim</serde.shim>
+                <hive.version>${generic.hive.version}</hive.version>
+                <hadoop.version>${generic.hadoop.version}</hadoop.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>cdh7</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
             <modules>
                 <module>json-serde-cdh7-shim</module>
             </modules>
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <serde.shim>json-serde-cdh7-shim</serde.shim>
-                <cdh.version>${cdh7.version}</cdh.version>
-                <cdh.hive.version>${cdh7.hive.version}</cdh.hive.version>
-                <cdh.hadoop.version>${cdh7.hadoop.version}</cdh.hadoop.version>
-                <cdh.shim>cdh7</cdh.shim>
+                <hive.version>${cdh7.hive.version}</hive.version>
+                <hadoop.version>${cdh7.hadoop.version}</hadoop.version>
             </properties>
         </profile>
         <profile>
@@ -77,10 +93,8 @@
             <properties>
                 <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                 <serde.shim>json-serde-hdp3-shim</serde.shim>
-                <cdh.version>${hdp3.version}</cdh.version>
-                <cdh.hive.version>${hdp3.hive.version}</cdh.hive.version>
-                <cdh.hadoop.version>${hdp3.hadoop.version}</cdh.hadoop.version>
-                <cdh.shim>hdp3</cdh.shim>
+                <hive.version>${hdp3.hive.version}</hive.version>
+                <hadoop.version>${hdp3.hadoop.version}</hadoop.version>
             </properties>
         </profile>
     </profiles>
@@ -92,17 +106,6 @@
     </modules>
 
     <repositories>
-        <repository>
-            <id>Cloudera</id>
-            <name>Cloudera Maven Repo</name>
-            <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
-        </repository>
-        <repository>
-            <id>HortonWorks</id>
-            <name>HortonWorks Maven Repo</name>
-            <url>https://repo.hortonworks.com/content/repositories/releases/</url>
-        </repository>
-
         <repository>
             <id>ossrh.snapshots</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots</url>