Rework schemas