Added wait_timeout option