Modified schema structure to adhere to the new format.