Fixing Server 3 and serialisation