Enhance logging

Enhance logging