Updated schema