Move ZSchema usage to schema