Logging enhancement

Logging enhancement