Modified schema to match what we discussed.