Change connection handling mechanism
Add connection timeout
Add client package