Pass schema through as well