Added more replication stuff