More schema API goodness, more merging