Added more messages to DIAGNOSTICS