Add stop feature