Commit of example, retry_handler and some other logic to handle the retry queue setup.