Added missing fields to deserialization