Updated conditional assignment on optional data