Add support for :tee