Added functionality for Sources with varying Spectrum