Consolidate schema