Enhance logging