refactor cross schema patch