added optional data settings