Add logging
Add client socket timeout