Logging feature added