Change to schema upgrade behavior