support for 2.0 compatibility + Diags