Add client pool
Add more code on client