Feature/persistent diags