Added additional functionality to mock
Logging and Retry