Adding a timeout option