Marotta and Buffon to extend