Attempt to get the schema right