Tampa Bay Rays infielder Yandy Díaz agreed to a $24 million, three-year contract on Tuesday that avoided a salary arbitration hearing.

Díaz's agreement could be worth $36 million over four seasons.