Don't save null dict entries.
Added filepaths to parameters.