Better handling of optional data