Adding additional logging to assist troubleshooting