rework schema