Add tap output support
Fix conflict