Clarified schema based on feedback