Now under modifying for HIVE-2137