Support config reset
updated class diags for CPP version