I'll see how to add it to zap.stream as well, can ping @Kieran if I can't figure it out.