Changed with-schema to use a helper method do-with-schema