Adjustments from ayan4m1 (schema compability)

I just merged the changes from [ayan4m1](/ayan4m1/hive)