Small refactor to schema replicator