Add further logging