Added socket timeout