Adding more diagnostics logging