Added timeout attribute