Remove DiscoverableWrapper and use ByteBuffer as payload