Updated RetryController: Added response messages, some refactorings