Adding proper logging support.