Added a global timeout