I know you've just added an argument, but would you mind adding return type too? I think this method maybe returns something like an (Enumerator[?], ChannelHandler) but I'm a bit confused. :)