Logging support added