Updated schema to reflect latest changes in tables.