More schema refinements.