Improve manual entry for replication