Changed deserialization, not using database