Make compatible with Hive 11