Update for hive support.