Add basic support for TAP-J and TAP-Y