Added extra diagnostics logging