Use the new SourceHelper