Adding additional debug logging