Schema overhaul