Changes related to timeout