Added the SourceInfo stuff and make Mapped source info