Modified deserialization