Added wiretap
Added wiretap support