Update for latest SpecialSource snapshot