Make new unserialization work