Added more DIAG fields