Moved retry to util module