Add stoponover option