Added replication support