Both agree extensions that keeps them at the club until 2017.