This replaces the previous support which was pretty much a giant hack and was not synchronised between servers.