fixup! Move schema function to schemas