diff --git a/lib/rbhive/t_c_l_i_schema_definition.rb b/lib/rbhive/t_c_l_i_schema_definition.rb
index 310283c..cae2411 100644
--- a/lib/rbhive/t_c_l_i_schema_definition.rb
+++ b/lib/rbhive/t_c_l_i_schema_definition.rb
@@ -1,4 +1,5 @@
 require 'json'
+require File.join(File.dirname(__FILE__), *%w[.. thrift t_c_l_i_service_constants])
 
 module RBHive
   class TCLISchemaDefinition
@@ -52,7 +53,7 @@ def column_type_map
       @column_type_map ||= column_names.inject({}) do |hsh, c| 
         definition = @schema.columns.find {|s| s.columnName.to_sym == c }
         # If the column isn't in the schema (eg partitions in SELECT * queries) assume they are strings
-        type = TYPE_NAMES[definition.typeDesc.types.first.primitiveEntry.type].downcase rescue nil
+        type = Hive2::Thrift::TYPE_NAMES[definition.typeDesc.types.first.primitiveEntry.type].downcase rescue nil
         hsh[c] = definition && type ? type.to_sym : :string
         hsh
       end