Added support for slave/master replication