add SourceFile and Location to replace Filename and Path later