now with more schema