Data and schema options (updated)