Replication manager changes