Adding an implicit timeout