Refactor Client and Transport
Add culprit reporting