Add ability to change retry handler