Added logging support