Added Logging support