Add Diag and Note monkeypatching support