Replication related changes