Further enhanced logging