Add timeout
Add client script