Adding tap support