Added some additional logging