Added a timeout to data connection