Added schema upgrade support