Added add_spectra option to all models