The 2019 Roland Garros runner-up is looking forward to being a comeback kid in 2020.
The 2009 US Open men's singles finalists will take their talents to Buenos Aires in November.
The Frenchman has found a new charge after parting ways with Garbine Muguruza this summer.
The event may not happen in 2019 as protests have shook the region all summer.
The World No.1 pulled out of the US Open with a left shoulder injury, but plans to play rejoin the tour this autumn.
The Greek has set his goals for the remainder of the 2019 season.
Juan Martin del Potro took to the court for the first time since undergoing surgery on his right knee in June.
