Add debug and retry number in remote call