Adding timeout flag