Added more diagnostics