Added diagnostics for CI Build