Update for SourceScript changes