Timeouts

Enabling the timeouts in the client wrapper.