(CNN) -- Lionel Messi has agreed a new contract with Barcelona, which will keep the Argentine at the Spanish club until 2018.

The 25-year-old already had a deal that expired with the European giants in 2016, but that has now been extended by two years.

Messi has been in sensational form this year, scoring 90 goals for both club and country to surpass the previous goalscoring record for a calendar year set by Gerd Mueller in 1972, when the German scored 85 goals.

The 21-time Spanish champions have also verbally agreed new deals with midfielder Xavi, who will extend his contract from 2014 until 2016, while defender Carles Puyol, whose contract had been due to expire next year, will stay with Barca until 2016.

None of the players has yet to put pen to paper on their new contracts but the Barca website says this will happen "over the course of the next few weeks".

"This news means that FC Barcelona has secured its ties with three of its most important players," the club said on its official website.

While both club captain Puyol, 34, and Xavi, 32, are significant figures at the club, Barcelona officials are likely to look upon the extension of Messi's deal as the most important.

Widely regarded as the best footballer in the world, the diminutive Argentina international has often spoke of the debt of gratitude he believes he owes the Catalan club.

At the age of 11, Messi was diagnosed with a growth hormone deficiency and neither his existing club in his home town Rosario -- Newell's Old Boys -- nor Buenos Aires giants River Plate were prepared to provide the money to treat his condition, which amounted to some US$1,000 per month.

Based on the article and the following list of answers, write a list of questions.

1. 25
2. Barcelona
3. it will keep the Argentine at the Spanish club
4. Puyol and Xavi
5. 2016
6. 11
7. a growth hormone deficiency
8. no
9. $1,000
10. in 1972
1. How old is Messi?
2. He has agreed a new contract with who?
3. What will this contract lead to?
4. Who are the significant figures at the club?
5. His deal with European giants expired in what year/
6. At what age was Messi diagnosed with a deficiency?
7. What's the name of the deficiency?
8. Was anyone prepared to give money for his treatment?
9. what was the amount that was needed monthly?
10. When did the German score 85 goals?