schema overhaul