[#60546140] Change the schema to match the gui