Refactoring, retries, ..