Additional schema work.