Add group flags to handle timeouts