Continue with adding logging support