Better attribute handling so we don't break when API returns new fields