Geo: Improve the self-service geo replication framework