Putting back removed attributes with null values

- adding in previously removed fields so to not break the
implementation on devices.