Modified database for optional data