Contract extensions have been agreed with Fermin Lopez and Gavi in 2024 with talks ongoing to retain midfield star Pedri.