The 21-year-old German international has signed a new five year deal that will keep him at the Allianz Arena until 2030.