Adde more diagnostics