Major updates to replication