Restructured the schema