Adding ability to set the overall timeout