Add some additional logging