Adding some additional logging