Added Hive support