Update template - put schemas in one tab, add merging