Replication related API update - WIP