Add additional logging