improved tap support