Added socket timeout
Update