Added NIO TAP support