Added headers and source link indication