Updated schema to the new requirements