Updated schema to provided solution.