Added wait and retry handling on both source and destination