diff --git a/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java b/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java
index 15830f61c03..5dbc8607d95 100644
--- a/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java
+++ b/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java
@@ -110,9 +110,9 @@ public class ParquetTypeHelper {
     </#list>
             originalTypeMap.put(MinorType.VARCHAR, OriginalType.UTF8);
             originalTypeMap.put(MinorType.DATE, OriginalType.DATE);
-            originalTypeMap.put(MinorType.TIME, OriginalType.TIME);
-            originalTypeMap.put(MinorType.TIMESTAMP, OriginalType.TIMESTAMP);
-            originalTypeMap.put(MinorType.TIMESTAMPTZ, OriginalType.TIMESTAMPTZ);
+            originalTypeMap.put(MinorType.TIME, OriginalType.TIME_MILLIS);
+            originalTypeMap.put(MinorType.TIMESTAMP, OriginalType.TIMESTAMP_MILLIS);
+//            originalTypeMap.put(MinorType.TIMESTAMPTZ, OriginalType.TIMESTAMPTZ);
   }
 
   public static PrimitiveTypeName getPrimitiveTypeNameForMinorType(MinorType minorType) {
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java
index 7eeeeaa2660..5bba6be67ec 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java
@@ -59,9 +59,10 @@ public static TypeProtos.MajorType toMajorType(PrimitiveType.PrimitiveTypeName p
             switch(convertedType) {
               case DECIMAL:
                 return Types.withScaleAndPrecision(TypeProtos.MinorType.DECIMAL18, DataMode.OPTIONAL, schemaElement.getScale(), schemaElement.getPrecision());
-              case FINETIME:
-                throw new UnsupportedOperationException();
-              case TIMESTAMP:
+              // TODO - add this back if it is decided to be added upstream, was removed form our pull request July 2014
+//              case TIME_MICROS:
+//                throw new UnsupportedOperationException();
+              case TIMESTAMP_MILLIS:
                 return Types.optional(MinorType.TIMESTAMP);
               default:
                 throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType));
@@ -75,7 +76,7 @@ public static TypeProtos.MajorType toMajorType(PrimitiveType.PrimitiveTypeName p
                 return Types.withScaleAndPrecision(MinorType.DECIMAL9, DataMode.OPTIONAL, schemaElement.getScale(), schemaElement.getPrecision());
               case DATE:
                 return Types.optional(MinorType.DATE);
-              case TIME:
+              case TIME_MILLIS:
                 return Types.optional(MinorType.TIME);
               default:
                 throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType));
@@ -123,9 +124,9 @@ public static TypeProtos.MajorType toMajorType(PrimitiveType.PrimitiveTypeName p
             switch(convertedType) {
               case DECIMAL:
                 return Types.withScaleAndPrecision(MinorType.DECIMAL18, DataMode.REQUIRED, schemaElement.getScale(), schemaElement.getPrecision());
-              case FINETIME:
-                throw new UnsupportedOperationException();
-              case TIMESTAMP:
+//              case FINETIME:
+//                throw new UnsupportedOperationException();
+              case TIMESTAMP_MILLIS:
                 return Types.required(MinorType.TIMESTAMP);
               default:
                 throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType));
@@ -139,7 +140,7 @@ public static TypeProtos.MajorType toMajorType(PrimitiveType.PrimitiveTypeName p
                 return Types.withScaleAndPrecision(MinorType.DECIMAL9, DataMode.REQUIRED, schemaElement.getScale(), schemaElement.getPrecision());
               case DATE:
                 return Types.required(MinorType.DATE);
-              case TIME:
+              case TIME_MILLIS:
                 return Types.required(MinorType.TIME);
               default:
                 throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType));
@@ -187,9 +188,9 @@ public static TypeProtos.MajorType toMajorType(PrimitiveType.PrimitiveTypeName p
             switch(convertedType) {
               case DECIMAL:
                 return Types.withScaleAndPrecision(MinorType.DECIMAL18, DataMode.REPEATED, schemaElement.getScale(), schemaElement.getPrecision());
-              case FINETIME:
-                throw new UnsupportedOperationException();
-              case TIMESTAMP:
+//              case FINETIME:
+//                throw new UnsupportedOperationException();
+              case TIMESTAMP_MILLIS:
                 return Types.repeated(MinorType.TIMESTAMP);
               default:
                 throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType));
@@ -203,7 +204,7 @@ public static TypeProtos.MajorType toMajorType(PrimitiveType.PrimitiveTypeName p
                 return Types.withScaleAndPrecision(MinorType.DECIMAL9, DataMode.REPEATED, schemaElement.getScale(), schemaElement.getPrecision());
               case DATE:
                 return Types.repeated(MinorType.DATE);
-              case TIME:
+              case TIME_MILLIS:
                 return Types.repeated(MinorType.TIME);
               default:
                 throw new UnsupportedOperationException(String.format("unsupported type: %s %s", primitiveTypeName, convertedType));
diff --git a/sample-data/nation.parquet b/sample-data/nation.parquet
old mode 100644
new mode 100755
index db654921690..9109d8b4140
Binary files a/sample-data/nation.parquet and b/sample-data/nation.parquet differ
diff --git a/sample-data/nationsMF/nation.parquet b/sample-data/nationsMF/nation.parquet
deleted file mode 100644
index db654921690..00000000000
Binary files a/sample-data/nationsMF/nation.parquet and /dev/null differ
diff --git a/sample-data/nationsMF/nation2.parquet b/sample-data/nationsMF/nation2.parquet
deleted file mode 100644
index db654921690..00000000000
Binary files a/sample-data/nationsMF/nation2.parquet and /dev/null differ
diff --git a/sample-data/nationsMF/nationsMF.parquet b/sample-data/nationsMF/nationsMF.parquet
new file mode 100755
index 00000000000..614487bd016
Binary files /dev/null and b/sample-data/nationsMF/nationsMF.parquet differ
diff --git a/sample-data/nationsSF/nation.parquet b/sample-data/nationsSF/nation.parquet
deleted file mode 100644
index db654921690..00000000000
Binary files a/sample-data/nationsSF/nation.parquet and /dev/null differ
diff --git a/sample-data/nationsSF/nationsSF.parquet b/sample-data/nationsSF/nationsSF.parquet
new file mode 100755
index 00000000000..9109d8b4140
Binary files /dev/null and b/sample-data/nationsSF/nationsSF.parquet differ
diff --git a/sample-data/region.parquet b/sample-data/region.parquet
old mode 100644
new mode 100755
index ab8122c858e..fc72fcf63b8
Binary files a/sample-data/region.parquet and b/sample-data/region.parquet differ
diff --git a/sample-data/regionsMF/region.parquet b/sample-data/regionsMF/region.parquet
deleted file mode 100644
index ab8122c858e..00000000000
Binary files a/sample-data/regionsMF/region.parquet and /dev/null differ
diff --git a/sample-data/regionsMF/region2.parquet b/sample-data/regionsMF/region2.parquet
deleted file mode 100644
index ab8122c858e..00000000000
Binary files a/sample-data/regionsMF/region2.parquet and /dev/null differ
diff --git a/sample-data/regionsMF/regionsMF_Typed.parquet b/sample-data/regionsMF/regionsMF_Typed.parquet
new file mode 100755
index 00000000000..eda97a2d175
Binary files /dev/null and b/sample-data/regionsMF/regionsMF_Typed.parquet differ
diff --git a/sample-data/regionsSF/region.parquet b/sample-data/regionsSF/region.parquet
deleted file mode 100644
index ab8122c858e..00000000000
Binary files a/sample-data/regionsSF/region.parquet and /dev/null differ
diff --git a/sample-data/regionsSF/regionsSF.parquet b/sample-data/regionsSF/regionsSF.parquet
new file mode 100755
index 00000000000..fc72fcf63b8
Binary files /dev/null and b/sample-data/regionsSF/regionsSF.parquet differ