UEFA has announced a new agreement between 14 countries, including 2018 World Cup hosts Russia, to help prevent football hooliganism.
France, Bulgaria, Georgia, Greece, Lithuania, Moldova, Monaco, Montenegro, Netherlands, Portugal, Russia, Switzerland, Macedonia and Ukraine all signed the convention between UEFA and the Council of Europe (CoE).
CoE secretary general Thorbjorn Jagland said the organisation expects that "many [countries] will follow suit" in signing.
UEFA said on its official website that the new agreement "aims to promote hospitality and safety of spectators inside and outside stadiums, improve dialogue between the police, local authorities, football clubs and supporters, strengthen international police cooperation, and prevent and punish hooliganism through effective measures."
It replaces the European Convention on Spectator Violence and Misbehaviour at Sports Events, which was agreed in 1985 after the Heysel tragedy.
Euro 2016 has seen a significant amount of fan violence, with much of it involving Russian fans, who most notably clashed with England supporters in Marseille ahead of the teams' opening match as well as at the stadium. UEFA then warned Russia and England they faced the threat of disqualification.
Michael van Praag, head of UEFA's Stadia and Security committee, hopes the new agreement will bring an end to scenes like those in Marseille.
"I'm sure that in the future we can use the intelligence of various police forces," Van Praag told reporters. "That has not been working 100 percent until now and this is the reason why we have this convention.
"I am sure in the future when this exchange of information between countries and police forces will go on, problems like the one we had in Marseille and in many competitions in Europe will belong in the past."
Although the U.S. State Department had highlighted the prospect of clashes between Russia and England fans before the tournament, Van Praag said it was unfair to blame a lack of preparation.
"The authorities were very well prepared to organise this match but nobody expected this [violence] to happen on such a level," he said. "You cannot expect the tournament organisation to beforehand change kick-off times, or beforehand change the venues.
"We knew for months in advance that this match had to be played in Marseille and there were no signals whatsoever that the game would be disturbed in the way it was."
Three days in Marseille: This is not simply an "England on the rampage," story. It's more complex than that. @ESPNFC https://t.co/wdyiZAFBbJ
- Iain Macintosh (@iainmacintosh) June 12, 2016
There have been concerns over the chances of violence at the 2018 World Cup in Russia for some time, and some senior officials in the nation have increased fears by failing to condemn the hooliganism at Euro 2016.
Russian FA (RFS) executive Igor Lebedev said "90 percent of the fans go to football in order to fight, and it is normal," while Russian sports minister Vitaly Mutko downplayed the incident at the end of the draw with England, saying: "There was no clash ... That's being exaggerated."
Vladimir Markin, a spokesman for Russia's equivalent of the FBI, also claimed French police were unable to handle Russia's "normal" football fans in Marseille because they are more used to policing "gay parades."
However, the CoE's Jagland is hopeful that the convention has been agreed at an appropriate moment to tackle the issue at the 2018 World Cup as well as the 2020 European Championship, which is to be played across the continent, with the semifinals and final taking place in England.
"It's an opportune moment, with preparations under way for the 2018 FIFA World Cup in Russia, and UEFA EURO 2020, which will be held in 13 countries around Europe," Jagland said.