Add configurable timeout to client.
Add command line to context information.