Added support for Hive Server 1 and 2