Corrected schema and toggles