Opt params now saves too

Opt params now saves too
Changed DataSetModel