Added more tag to WriteDebuggerFriendlyDataModels