Rearrange schema properties