fixed the schema structure