Added timeout on retrieveing