Adding timeout options