Adding support for pig and hive.