[MOD] Add a timeout option