Add timeout option, and change default to 5 mins