More schema goodness