Add same verbose logging logic