Added timeout setting