Added diagnostics messages