Refactoring of server actions
Refactoring of replication actions