added timeout options and rescue timeout